fixed typescript types module inclusion

4 files changed, 16 insertions, 239 deletions

diff --git a/src/client/util/Scripting.ts b/src/client/util/Scripting.ts
index b9e0943b6..c63d3d7cb 100644
--- a/src/client/util/Scripting.ts
+++ b/src/client/util/Scripting.ts
@@ -1,7 +1,7 @@
 // export const ts = (window as any).ts;
 // import * as typescriptlib from '!!raw-loader!../../../node_modules/typescript/lib/lib.d.ts'
 // import * as typescriptes5 from '!!raw-loader!../../../node_modules/typescript/lib/lib.es5.d.ts'
-import * as typescriptlib from './type_decls.d';
+import typescriptlib from 'type_decls.d';
 import * as ts from 'typescript';
 import { Doc, FieldType } from '../../fields/Doc';
 import { RefField } from '../../fields/RefField';
@@ -248,7 +248,7 @@ export function CompileScript(script: string, options: ScriptOptions = {}): Comp
     const funcScript = `(function(${paramString})${reqTypes} { ${body} })`;
     host.writeFile('file.ts', funcScript);
 
-    if (typecheck) host.writeFile('node_modules/typescript/lib/lib.d.ts', typescriptlib.default);
+    if (typecheck) host.writeFile('node_modules/typescript/lib/lib.d.ts', typescriptlib);
     const program = ts.createProgram(['file.ts'], {}, host);
     const testResult = program.emit();
     const outputText = host.readFile('file.js');
diff --git a/src/client/util/type_decls.txt b/src/client/util/type_decls.txt
deleted file mode 100644
index 1a93bbe59..000000000
--- a/src/client/util/type_decls.txt
+++ /dev/null
@@ -1,224 +0,0 @@
-//@ts-ignore
-declare type PropertyKey = string | number | symbol;
-interface Array<T> {
-    length: number;
-    toString(): string;
-    toLocaleString(): string;
-    pop(): T | undefined;
-    push(...items: T[]): number;
-    concat(...items: ConcatArray<T>[]): T[];
-    concat(...items: (T | ConcatArray<T>)[]): T[];
-    join(separator?: string): string;
-    reverse(): T[];
-    shift(): T | undefined;
-    slice(start?: number, end?: number): T[];
-    sort(compareFn?: (a: T, b: T) => number): this;
-    splice(start: number, deleteCount?: number): T[];
-    splice(start: number, deleteCount: number, ...items: T[]): T[];
-    unshift(...items: T[]): number;
-    indexOf(searchElement: T, fromIndex?: number): number;
-    lastIndexOf(searchElement: T, fromIndex?: number): number;
-    every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-    some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean;
-    forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void;
-    map<U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[];
-    filter<S extends T>(callbackfn: (value: T, index: number, array: T[]) => value is S, thisArg?: any): S[];
-    filter(callbackfn: (value: T, index: number, array: T[]) => any, thisArg?: any): T[];
-    reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T): T;
-    reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue: T): T;
-    reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
-    reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T): T;
-    reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue: T): T;
-    reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
-
-    [n: number]: T;
-}
-
-interface Function {
-    apply(this: Function, thisArg: any, argArray?: any): any;
-    call(this: Function, thisArg: any, ...argArray: any[]): any;
-    bind(this: Function, thisArg: any, ...argArray: any[]): any;
-    toString(): string;
-
-    prototype: any;
-    readonly length: number;
-
-    // Non-standard extensions
-    arguments: any;
-    caller: Function;
-}
-interface Boolean {
-    valueOf(): boolean;
-}
-interface Number {
-    toString(radix?: number): string;
-    toFixed(fractionDigits?: number): string;
-    toExponential(fractionDigits?: number): string;
-    toPrecision(precision?: number): string;
-    valueOf(): number;
-}
-interface IArguments {
-    [index: number]: any;
-    length: number;
-    callee: Function;
-}
-interface RegExp {
-    readonly flags: string;
-    readonly sticky: boolean;
-    readonly unicode: boolean;
-}
-interface Date {
-    now() : string;
-}
-interface String {
-    codePointAt(pos: number): number | undefined;
-    includes(searchString: string, position?: number): boolean;
-    endsWith(searchString: string, endPosition?: number): boolean;
-    normalize(form: "NFC" | "NFD" | "NFKC" | "NFKD"): string;
-    normalize(form?: string): string;
-    repeat(count: number): string;
-    replace(a:any, b:any):string; // bcz: fix this
-    startsWith(searchString: string, position?: number): boolean;
-    anchor(name: string): string;
-    big(): string;
-    blink(): string;
-    bold(): string;
-    fixed(): string;
-    fontcolor(color: string): string;
-    fontsize(size: number): string;
-    fontsize(size: string): string;
-    italics(): string;
-    link(url: string): string;
-    small(): string;
-    strike(): string;
-    sub(): string;
-    sup(): string;
-}
-interface Object {
-    constructor: Function;
-    toString(): string;
-    toLocaleString(): string;
-    valueOf(): Object;
-    hasOwnProperty(v: PropertyKey): boolean;
-    isPrototypeOf(v: Object): boolean;
-    propertyIsEnumerable(v: PropertyKey): boolean;
-}
-interface ConcatArray<T> {
-    readonly length: number;
-    readonly [n: number]: T;
-    join(separator?: string): string;
-    slice(start?: number, end?: number): T[];
-}
-interface URL {
-    hash: string;
-    host: string;
-    hostname: string;
-    href: string;
-    readonly origin: string;
-    password: string;
-    pathname: string;
-    port: string;
-    protocol: string;
-    search: string;
-    username: string;
-    toJSON(): string;
-}
-interface PromiseLike<T> {
-    then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): PromiseLike<TResult1 | TResult2>;
-}
-interface Promise<T> {
-    then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<TResult1 | TResult2>;
-    catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): Promise<T | TResult>;
-}
-
-declare const Update: unique symbol;
-declare const Self: unique symbol;
-declare const SelfProxy: unique symbol;
-declare const DataSym: unique symbol;
-declare const HandleUpdate: unique symbol;
-declare const Id: unique symbol;
-declare const OnUpdate: unique symbol;
-declare const Parent: unique symbol;
-declare const Copy: unique symbol;
-declare const ToScriptString: unique symbol;
-
-declare abstract class RefField {
-    readonly [Id]: FieldId;
-
-    constructor();
-}
-
-declare type FieldId = string;
-
-declare abstract class ObjectField {
-    abstract [Copy](): ObjectField;
-}
-
-declare abstract class URLField extends ObjectField {
-    readonly url: URL;
-
-    constructor(url: string);
-    constructor(url: URL);
-}
-
-declare class RichTextField extends URLField { 
-    [Copy](): ObjectField; 
-    constructor(data:string, text: string);
-}
-declare class AudioField extends URLField { [Copy](): ObjectField; }
-declare class VideoField extends URLField { [Copy](): ObjectField; }
-declare class ImageField extends URLField { [Copy](): ObjectField; }
-declare class WebField extends URLField { [Copy](): ObjectField; }
-declare class PdfField extends URLField { [Copy](): ObjectField; }
-
-declare const ComputedField: any;
-declare const CompileScript: any;
-
-// @ts-ignore
-declare type Extract<T, U> = T extends U ? T : never;
-declare type Field = number | string | boolean | ObjectField | RefField;
-declare type FieldWaiting<T extends RefField = RefField> = T extends undefined ? never : Promise<T | undefined>;
-declare type FieldResult<T extends Field = Field> = Opt<T> | FieldWaiting<Extract<T, RefField>>;
-
-declare type Opt<T> = T | undefined;
-declare class Doc extends RefField {
-    constructor();
-
-    [key: string]: FieldResult;
-    // [ToScriptString](): string;
-}
-
-declare class List<T extends Field> extends ObjectField {
-    constructor(fields?: T[]);
-    [index: number]: T | (T extends RefField ? Promise<T> : never);
-    [Copy](): ObjectField;
-}
-
-declare class InkField extends ObjectField {
-    constructor(data:Array<{X:number, Y:number}>);
-    [Copy](): ObjectField;
-}
-
-// @ts-ignore
-declare const console: any;
-
-interface DocumentOptions { }
-
-declare const Docs: {
-    ImageDocument(url: string, options?: DocumentOptions): Doc;
-    VideoDocument(url: string, options?: DocumentOptions): Doc;
-    TextDocument(options?: DocumentOptions): Doc;
-    PdfDocument(url: string, options?: DocumentOptions): Doc;
-    WebDocument(url: string, options?: DocumentOptions): Doc;
-    HtmlDocument(html: string, options?: DocumentOptions): Doc;
-    MapDocument(url: string, options?: DocumentOptions): Doc;
-    KVPDocument(document: Doc, options?: DocumentOptions): Doc;
-    FreeformDocument(documents: Doc[], options?: DocumentOptions): Doc;
-    SchemaDocument(columns: string[], documents: Doc[], options?: DocumentOptions): Doc;
-    TreeDocument(documents: Doc[], options?: DocumentOptions): Doc;
-    StackingDocument(documents: Doc[], options?: DocumentOptions): Doc;
-};
-
-declare function idToDoc(id:string):any;
-declare function assignDoc(doc:Doc, field:any, id:any):string;
-declare function d(...args:any[]):any;
diff --git a/src/typings/index.d.ts b/src/typings/index.d.ts
index a9ebbb480..bee79a38d 100644
--- a/src/typings/index.d.ts
+++ b/src/typings/index.d.ts
@@ -12,13 +12,14 @@ declare module 'fit-curve';
 declare module 'iink-js';
 declare module 'pdfjs-dist/web/pdf_viewer';
 declare module 'react-jsx-parser';
+declare module 'type_decls.d';
 
 declare module '@react-pdf/renderer' {
     import * as React from 'react';
 
     namespace ReactPDF {
         interface Style {
-            [property: string]: any;
+            [property: string]: unknown;
         }
         interface Styles {
             [key: string]: Style;
@@ -32,7 +33,7 @@ declare module '@react-pdf/renderer' {
             keywords?: string;
             creator?: string;
             producer?: string;
-            onRender?: () => any;
+            onRender?: () => unknown;
         }
 
         /**
@@ -213,13 +214,13 @@ declare module '@react-pdf/renderer' {
             src: string;
             loaded: boolean;
             loading: boolean;
-            data: any;
-            [key: string]: any;
+            data: unknown;
+            [key: string]: unknown;
         }
-        type HyphenationCallback = (words: string[], glyphString: { [key: string]: any }) => string[];
+        type HyphenationCallback = (words: string[], glyphString: { [key: string]: unknown }) => string[];
 
         const Font: {
-            register: (src: string, options: { family: string; [key: string]: any }) => void;
+            register: (src: string, options: { family: string; [key: string]: unknown }) => void;
             getEmojiSource: () => EmojiSource;
             getRegisteredFonts: () => string[];
             registerEmojiSource: (emojiSource: EmojiSource) => void;
@@ -252,21 +253,21 @@ declare module '@react-pdf/renderer' {
             };
         };
 
-        const version: any;
+        const version: unknown;
 
-        const PDFRenderer: any;
+        const PDFRenderer: unknown;
 
         const createInstance: (
             element: {
                 type: string;
-                props: { [key: string]: any };
+                props: { [key: string]: unknown };
             },
-            root?: any
-        ) => any;
+            root?: unknown
+        ) => unknown;
 
         const pdf: (document: React.ReactElement<DocumentProps>) => {
             isDirty: () => boolean;
-            updateContainer: (document: React.ReactElement<any>) => void;
+            updateContainer: (document: React.ReactElement<unknown>) => void;
             toBuffer: () => NodeJS.ReadableStream;
             toBlob: () => Blob;
             toString: () => string;
@@ -274,7 +275,7 @@ declare module '@react-pdf/renderer' {
 
         const renderToStream: (document: React.ReactElement<DocumentProps>) => NodeJS.ReadableStream;
 
-        const renderToFile: (document: React.ReactElement<DocumentProps>, filePath: string, callback?: (output: NodeJS.ReadableStream, filePath: string) => any) => Promise<NodeJS.ReadableStream>;
+        const renderToFile: (document: React.ReactElement<DocumentProps>, filePath: string, callback?: (output: NodeJS.ReadableStream, filePath: string) => unknown) => Promise<NodeJS.ReadableStream>;
 
         const render: typeof renderToFile;
     }
diff --git a/src/client/util/type_decls.d b/src/typings/type_decls.d
index 1a93bbe59..1a93bbe59 100644
--- a/src/client/util/type_decls.d
+++ b/src/typings/type_decls.d