@hpcc-js/observablehq-compiler 1.1.1 → 1.1.2

package/src/writer.ts

@@ -1,80 +1,80 @@
-import { ohq } from "@hpcc-js/observable-shim";
-import { ParsedImportCell, ParsedVariable } from "./cst";
-
-export class Writer {
-
-    protected _files: ohq.File[] = [];
-    protected _imports: string[] = [];
-    protected _functions: string[] = [];
-    protected _defines: string[] = [];
-    protected _defineUid = 0;
-    protected _functionUid = 0;
-
-    constructor() {
-    }
-
-    toString() {
-        return `\
-${this._imports.join("\n")}
-
-${this._functions.join("\n").split("\n) {").join("){")}
-
-export default function define(runtime, observer) {
-  const main = runtime.module();
-
-  function toString() { return this.url; }
-  const fileAttachments = new Map([
-    ${this._files.map(f => `["${f.name}", { url: new URL("${f.url}"), mimeType: ${JSON.stringify(f.mime_type)}, toString }]`).join(",\n    ")}
-  ]);
-  main.builtin("FileAttachment", runtime.fileAttachments(name => fileAttachments.get(name)));
-
-  ${this._defines.join("\n  ")}
-
-  return main;
-}\n`;
-    }
-
-    files(files: ohq.File[]) {
-        this._files = [...this._files, ...files];
-    }
-
-    import(url: string) {
-        this._imports.push(`import define${++this._defineUid} from "${url}"; `);
-    }
-
-    importDefine(imp: Partial<ParsedImportCell>) {
-        const injections = imp.injections.map(inj => {
-            return inj.name === inj.alias ?
-                `"${inj.name}"` :
-                `{name: "${inj.name}", alias: "${inj.alias}"}`;
-        });
-        const derive = imp.injections.length ? `.derive([${injections.join(", ")}], main)` : "";
-        this._defines.push(`const child${this._defineUid} = runtime.module(define${this._defineUid})${derive};`);
-        imp.specifiers.forEach(s => {
-            this._defines.push(`main.import("${s.name}"${s.alias && s.alias !== s.name ? `, "${s.alias}"` : ""}, child${this._defineUid}); `);
-        });
-    }
-
-    function(variable: Partial<ParsedVariable>) {
-        let id = variable.id ?? `${++this._functionUid}`;
-        const idParts = id.split(" ");
-        id = `_${idParts[idParts.length - 1]}`;
-        this._functions.push(`${variable.func?.toString()?.replace("anonymous", `${id}`)}`);
-        return id;
-    }
-
-    define(variable: Partial<ParsedVariable>, observable = true, inlineFunc = false, funcId?: string) {
-        funcId = funcId ?? variable.id;
-        const observe = observable ? `.variable(observer(${variable.id ? JSON.stringify(variable.id) : ""}))` : "";
-        const id = variable.id ? `${JSON.stringify(variable.id)}, ` : "";
-        const inputs = variable.inputs.length ? `[${variable.inputs.map(i => JSON.stringify(i)).join(", ")}], ` : "";
-        const func = inlineFunc ?
-            variable.func?.toString() :
-            funcId;
-        this._defines.push(`main${observe}.define(${id}${inputs}${func});`);
-    }
-
-    error(msg: string) {
-    }
-}
-
+import { ohq } from "@hpcc-js/observable-shim";
+import { ParsedImportCell, ParsedVariable } from "./cst";
+
+export class Writer {
+
+    protected _files: ohq.File[] = [];
+    protected _imports: string[] = [];
+    protected _functions: string[] = [];
+    protected _defines: string[] = [];
+    protected _defineUid = 0;
+    protected _functionUid = 0;
+
+    constructor() {
+    }
+
+    toString() {
+        return `\
+${this._imports.join("\n")}
+
+${this._functions.join("\n").split("\n) {").join("){")}
+
+export default function define(runtime, observer) {
+  const main = runtime.module();
+
+  function toString() { return this.url; }
+  const fileAttachments = new Map([
+    ${this._files.map(f => `["${f.name}", { url: new URL("${f.url}"), mimeType: ${JSON.stringify(f.mime_type)}, toString }]`).join(",\n    ")}
+  ]);
+  main.builtin("FileAttachment", runtime.fileAttachments(name => fileAttachments.get(name)));
+
+  ${this._defines.join("\n  ")}
+
+  return main;
+}\n`;
+    }
+
+    files(files: ohq.File[]) {
+        this._files = [...this._files, ...files];
+    }
+
+    import(url: string) {
+        this._imports.push(`import define${++this._defineUid} from "${url}"; `);
+    }
+
+    importDefine(imp: Partial<ParsedImportCell>) {
+        const injections = imp.injections.map(inj => {
+            return inj.name === inj.alias ?
+                `"${inj.name}"` :
+                `{name: "${inj.name}", alias: "${inj.alias}"}`;
+        });
+        const derive = imp.injections.length ? `.derive([${injections.join(", ")}], main)` : "";
+        this._defines.push(`const child${this._defineUid} = runtime.module(define${this._defineUid})${derive};`);
+        imp.specifiers.forEach(s => {
+            this._defines.push(`main.import("${s.name}"${s.alias && s.alias !== s.name ? `, "${s.alias}"` : ""}, child${this._defineUid}); `);
+        });
+    }
+
+    function(variable: Partial<ParsedVariable>) {
+        let id = variable.id ?? `${++this._functionUid}`;
+        const idParts = id.split(" ");
+        id = `_${idParts[idParts.length - 1]}`;
+        this._functions.push(`${variable.func?.toString()?.replace("anonymous", `${id}`)}`);
+        return id;
+    }
+
+    define(variable: Partial<ParsedVariable>, observable = true, inlineFunc = false, funcId?: string) {
+        funcId = funcId ?? variable.id;
+        const observe = observable ? `.variable(observer(${variable.id ? JSON.stringify(variable.id) : ""}))` : "";
+        const id = variable.id ? `${JSON.stringify(variable.id)}, ` : "";
+        const inputs = variable.inputs.length ? `[${variable.inputs.map(i => JSON.stringify(i)).join(", ")}], ` : "";
+        const func = inlineFunc ?
+            variable.func?.toString() :
+            funcId;
+        this._defines.push(`main${observe}.define(${id}${inputs}${func});`);
+    }
+
+    error(msg: string) {
+    }
+}
+

package/types/__package__.d.ts

@@ -1,4 +1,4 @@
-export declare const PKG_NAME = "@hpcc-js/observablehq-compiler";
-export declare const PKG_VERSION = "1.1.1";
-export declare const BUILD_VERSION = "2.104.5";
+export declare const PKG_NAME = "@hpcc-js/observablehq-compiler";
+export declare const PKG_VERSION = "1.1.2";
+export declare const BUILD_VERSION = "2.104.5";
 //# sourceMappingURL=__package__.d.ts.map

package/types/__tests__/File Attachments.d.ts

@@ -1,110 +1,110 @@
-export declare const fa: {
-    id: string;
-    slug: string;
-    trashed: boolean;
-    description: string;
-    likes: number;
-    publish_level: string;
-    forks: number;
-    fork_of: any;
-    update_time: string;
-    publish_time: string;
-    publish_version: number;
-    latest_version: number;
-    thumbnail: string;
-    default_thumbnail: string;
-    roles: any[];
-    sharing: any;
-    owner: {
-        id: string;
-        avatar_url: string;
-        login: string;
-        name: string;
-        bio: string;
-        home_url: string;
-        type: string;
-        tier: string;
-    };
-    creator: {
-        id: string;
-        github_login: string;
-        avatar_url: string;
-        login: string;
-        name: string;
-        bio: string;
-        home_url: string;
-        tier: string;
-    };
-    authors: any[];
-    collections: {
-        id: string;
-        type: string;
-        slug: string;
-        title: string;
-        description: string;
-        update_time: string;
-        pinned: boolean;
-        ordered: boolean;
-        custom_thumbnail: string;
-        default_thumbnail: string;
-        thumbnail: string;
-        listing_count: number;
-        parent_collection_count: number;
-        owner: {
-            id: string;
-            avatar_url: string;
-            login: string;
-            name: string;
-            bio: string;
-            home_url: string;
-            type: string;
-            tier: string;
-        };
-    }[];
-    files: {
-        id: string;
-        url: string;
-        download_url: string;
-        name: string;
-        create_time: string;
-        status: string;
-        size: number;
-        mime_type: string;
-        content_encoding: string;
-    }[];
-    comments: {
-        id: string;
-        content: string;
-        node_id: number;
-        create_time: string;
-        update_time: any;
-        resolved: boolean;
-        user: {
-            id: string;
-            github_login: string;
-            avatar_url: string;
-            login: string;
-            name: string;
-            bio: string;
-            home_url: string;
-            tier: string;
-        };
-    }[];
-    commenting_lock: any;
-    suggestion_from: any;
-    suggestions_to: any[];
-    version: number;
-    title: string;
-    license: any;
-    copyright: string;
-    nodes: {
-        id: number;
-        value: string;
-        pinned: boolean;
-        mode: string;
-        data: any;
-        name: string;
-    }[];
-    resolutions: any[];
-};
+export declare const fa: {
+    id: string;
+    slug: string;
+    trashed: boolean;
+    description: string;
+    likes: number;
+    publish_level: string;
+    forks: number;
+    fork_of: any;
+    update_time: string;
+    publish_time: string;
+    publish_version: number;
+    latest_version: number;
+    thumbnail: string;
+    default_thumbnail: string;
+    roles: any[];
+    sharing: any;
+    owner: {
+        id: string;
+        avatar_url: string;
+        login: string;
+        name: string;
+        bio: string;
+        home_url: string;
+        type: string;
+        tier: string;
+    };
+    creator: {
+        id: string;
+        github_login: string;
+        avatar_url: string;
+        login: string;
+        name: string;
+        bio: string;
+        home_url: string;
+        tier: string;
+    };
+    authors: any[];
+    collections: {
+        id: string;
+        type: string;
+        slug: string;
+        title: string;
+        description: string;
+        update_time: string;
+        pinned: boolean;
+        ordered: boolean;
+        custom_thumbnail: string;
+        default_thumbnail: string;
+        thumbnail: string;
+        listing_count: number;
+        parent_collection_count: number;
+        owner: {
+            id: string;
+            avatar_url: string;
+            login: string;
+            name: string;
+            bio: string;
+            home_url: string;
+            type: string;
+            tier: string;
+        };
+    }[];
+    files: {
+        id: string;
+        url: string;
+        download_url: string;
+        name: string;
+        create_time: string;
+        status: string;
+        size: number;
+        mime_type: string;
+        content_encoding: string;
+    }[];
+    comments: {
+        id: string;
+        content: string;
+        node_id: number;
+        create_time: string;
+        update_time: any;
+        resolved: boolean;
+        user: {
+            id: string;
+            github_login: string;
+            avatar_url: string;
+            login: string;
+            name: string;
+            bio: string;
+            home_url: string;
+            tier: string;
+        };
+    }[];
+    commenting_lock: any;
+    suggestion_from: any;
+    suggestions_to: any[];
+    version: number;
+    title: string;
+    license: any;
+    copyright: string;
+    nodes: {
+        id: number;
+        value: string;
+        pinned: boolean;
+        mode: string;
+        data: any;
+        name: string;
+    }[];
+    resolutions: any[];
+};
 //# sourceMappingURL=File%20Attachments.d.ts.map

package/types/__tests__/Introduction to Imports.d.ts

@@ -1,120 +1,120 @@
-export declare const imports: {
-    id: string;
-    slug: string;
-    trashed: boolean;
-    description: string;
-    likes: number;
-    publish_level: string;
-    forks: number;
-    fork_of: any;
-    update_time: string;
-    publish_time: string;
-    publish_version: number;
-    latest_version: number;
-    thumbnail: string;
-    default_thumbnail: string;
-    roles: any[];
-    sharing: any;
-    owner: {
-        id: string;
-        avatar_url: string;
-        login: string;
-        name: string;
-        bio: string;
-        home_url: string;
-        type: string;
-        tier: string;
-    };
-    creator: {
-        id: string;
-        github_login: string;
-        avatar_url: string;
-        login: string;
-        name: string;
-        bio: string;
-        home_url: string;
-        tier: string;
-    };
-    authors: any[];
-    collections: {
-        id: string;
-        type: string;
-        slug: string;
-        title: string;
-        description: string;
-        update_time: string;
-        pinned: boolean;
-        ordered: boolean;
-        custom_thumbnail: string;
-        default_thumbnail: string;
-        thumbnail: string;
-        listing_count: number;
-        parent_collection_count: number;
-        owner: {
-            id: string;
-            avatar_url: string;
-            login: string;
-            name: string;
-            bio: string;
-            home_url: string;
-            type: string;
-            tier: string;
-        };
-    }[];
-    files: ({
-        id: string;
-        url: string;
-        download_url: string;
-        name: string;
-        create_time: string;
-        status: string;
-        size: number;
-        mime_type: any;
-        content_encoding: string;
-    } | {
-        id: string;
-        url: string;
-        download_url: string;
-        name: string;
-        create_time: string;
-        status: string;
-        size: number;
-        mime_type: string;
-        content_encoding: any;
-    })[];
-    comments: {
-        id: string;
-        content: string;
-        node_id: number;
-        create_time: string;
-        update_time: any;
-        resolved: boolean;
-        user: {
-            id: string;
-            github_login: string;
-            avatar_url: string;
-            login: string;
-            name: string;
-            bio: string;
-            home_url: string;
-            tier: string;
-        };
-    }[];
-    commenting_lock: any;
-    suggestion_from: any;
-    suggestions_to: any[];
-    version: number;
-    title: string;
-    license: any;
-    copyright: string;
-    nodes: {
-        id: number;
-        value: string;
-        pinned: boolean;
-        mode: string;
-        data: any;
-        name: string;
-    }[];
-    resolutions: any[];
-};
+export declare const imports: {
+    id: string;
+    slug: string;
+    trashed: boolean;
+    description: string;
+    likes: number;
+    publish_level: string;
+    forks: number;
+    fork_of: any;
+    update_time: string;
+    publish_time: string;
+    publish_version: number;
+    latest_version: number;
+    thumbnail: string;
+    default_thumbnail: string;
+    roles: any[];
+    sharing: any;
+    owner: {
+        id: string;
+        avatar_url: string;
+        login: string;
+        name: string;
+        bio: string;
+        home_url: string;
+        type: string;
+        tier: string;
+    };
+    creator: {
+        id: string;
+        github_login: string;
+        avatar_url: string;
+        login: string;
+        name: string;
+        bio: string;
+        home_url: string;
+        tier: string;
+    };
+    authors: any[];
+    collections: {
+        id: string;
+        type: string;
+        slug: string;
+        title: string;
+        description: string;
+        update_time: string;
+        pinned: boolean;
+        ordered: boolean;
+        custom_thumbnail: string;
+        default_thumbnail: string;
+        thumbnail: string;
+        listing_count: number;
+        parent_collection_count: number;
+        owner: {
+            id: string;
+            avatar_url: string;
+            login: string;
+            name: string;
+            bio: string;
+            home_url: string;
+            type: string;
+            tier: string;
+        };
+    }[];
+    files: ({
+        id: string;
+        url: string;
+        download_url: string;
+        name: string;
+        create_time: string;
+        status: string;
+        size: number;
+        mime_type: any;
+        content_encoding: string;
+    } | {
+        id: string;
+        url: string;
+        download_url: string;
+        name: string;
+        create_time: string;
+        status: string;
+        size: number;
+        mime_type: string;
+        content_encoding: any;
+    })[];
+    comments: {
+        id: string;
+        content: string;
+        node_id: number;
+        create_time: string;
+        update_time: any;
+        resolved: boolean;
+        user: {
+            id: string;
+            github_login: string;
+            avatar_url: string;
+            login: string;
+            name: string;
+            bio: string;
+            home_url: string;
+            tier: string;
+        };
+    }[];
+    commenting_lock: any;
+    suggestion_from: any;
+    suggestions_to: any[];
+    version: number;
+    title: string;
+    license: any;
+    copyright: string;
+    nodes: {
+        id: number;
+        value: string;
+        pinned: boolean;
+        mode: string;
+        data: any;
+        name: string;
+    }[];
+    resolutions: any[];
+};
 //# sourceMappingURL=Introduction%20to%20Imports.d.ts.map