@hpcc-js/observablehq-compiler 3.7.8 → 3.7.9

package/src/parse.ts

@@ -1,136 +1,136 @@
-// Compare with ../../../node_modules/@observablehq/parser/src/parse.js
-import { getLineInfo, tokTypes, Statement, ModuleDeclaration, Expression as ExpressionBase, Node } from "acorn";
-import { ancestor, RecursiveVisitors, AncestorVisitors } from "acorn-walk";
-import { CellParser, parseCell as ohqParseCell, walk as ohqWalk } from "@observablehq/parser";
-import defaultGlobals from "../../../node_modules/@observablehq/parser/src/globals.js";
-import findReferences from "../../../node_modules/@observablehq/parser/src/references.js";
-import findFeatures from "../../../node_modules/@observablehq/parser/src/features.js";
-
-export interface MutableExpression extends Node {
-    type: "MutableExpression"
-}
-
-export interface ViewExpression extends Node {
-    type: "ViewExpression"
-}
-
-export type Expression = ExpressionBase | MutableExpression | ViewExpression;
-
-// Find references.
-// Check for illegal references to arguments.
-// Check for illegal assignments to global references.
-function parseReferences(cell, input, globals = defaultGlobals) {
-    if (!cell.body) {
-        cell.references = [];
-    } else if (cell.body.type === "ImportDeclaration") {
-        //  This is correct?!?
-        cell.references = cell.body.specifiers
-            ? cell.body.specifiers.map(i => i.imported)
-            : [];
-    } else {
-        try {
-            cell.references = findReferences(cell, globals);
-        } catch (error: any) {
-            if (error.node) {
-                const loc = getLineInfo(input, error.node.start);
-                error.message += ` (${loc.line}:${loc.column})`;
-                error.pos = error.node.start;
-                error.loc = loc;
-                delete error.node;
-            }
-            throw error;
-        }
-    }
-    return cell;
-}
-
-// Find features: file attachments, secrets, database clients.
-// Check for illegal references to arguments.
-// Check for illegal assignments to global references.
-function parseFeatures(cell, input) {
-    if (cell.body && cell.body.type !== "ImportDeclaration") {
-        try {
-            cell.fileAttachments = findFeatures(cell, "FileAttachment");
-            cell.databaseClients = findFeatures(cell, "DatabaseClient");
-            cell.secrets = findFeatures(cell, "Secret");
-        } catch (error: any) {
-            if (error.node) {
-                const loc = getLineInfo(input, error.node.start);
-                error.message += ` (${loc.line}:${loc.column})`;
-                error.pos = error.node.start;
-                error.loc = loc;
-                delete error.node;
-            }
-            throw error;
-        }
-    } else {
-        cell.fileAttachments = new Map();
-        cell.databaseClients = new Map();
-        cell.secrets = new Map();
-    }
-    return cell;
-}
-
-class ModuleParser extends CellParser {
-
-    parseTopLevel(node: { cells?: Cell[] }) {
-        if (!node.cells) node.cells = [];
-        // @ts-ignore
-        while (this.type !== tokTypes.eof) {
-            // @ts-ignore
-            const cell: Cell = this.parseCell(this.startNode());
-            // @ts-ignore
-            cell.input = this.input;
-            node.cells.push(cell);
-        }
-        // @ts-ignore
-        this.next();
-        // @ts-ignore
-        return this.finishNode(node, "Program");
-    }
-}
-
-// @ts-ignore
-export function parseModule(input, { globals }: { globals: any } = {}) {
-    // @ts-ignore
-    const program = ModuleParser.parse(input, { ecmaVersion: 2020 });
-    for (const cell of program.cells) {
-        parseReferences(cell, input, globals);
-        parseFeatures(cell, input);
-    }
-    return program;
-}
-
-export interface Cell extends Node {
-    type: "Cell";
-    id: Expression;
-    text: string;
-    body?: Statement | ModuleDeclaration | Expression;
-    references: unknown[];
-    async: boolean;
-    generator: boolean;
-    strict: boolean;
-}
-
-export function splitModule(input: string): Cell[] {
-    return (ModuleParser as any)
-        .parse(input, { ecmaVersion: "latest" })
-        .cells.map((cell: any) => ({
-            type: "Cell",
-            text: input.substring(cell.start, cell.end),
-            start: cell.start,
-            end: cell.end
-        }));
-}
-
-export {
-    type Node,
-    ancestor,
-    type AncestorVisitors
-};
-
-export function parseCell(input: string): Cell {
-    return ohqParseCell(input);
-}
-
-export const walk: RecursiveVisitors<any> = ohqWalk;
+// Compare with ../../../node_modules/@observablehq/parser/src/parse.js
+import { getLineInfo, tokTypes, Statement, ModuleDeclaration, Expression as ExpressionBase, Node } from "acorn";
+import { ancestor, RecursiveVisitors, AncestorVisitors } from "acorn-walk";
+import { CellParser, parseCell as ohqParseCell, walk as ohqWalk } from "@observablehq/parser";
+import defaultGlobals from "../../../node_modules/@observablehq/parser/src/globals.js";
+import findReferences from "../../../node_modules/@observablehq/parser/src/references.js";
+import findFeatures from "../../../node_modules/@observablehq/parser/src/features.js";
+
+export interface MutableExpression extends Node {
+    type: "MutableExpression"
+}
+
+export interface ViewExpression extends Node {
+    type: "ViewExpression"
+}
+
+export type Expression = ExpressionBase | MutableExpression | ViewExpression;
+
+// Find references.
+// Check for illegal references to arguments.
+// Check for illegal assignments to global references.
+function parseReferences(cell, input, globals = defaultGlobals) {
+    if (!cell.body) {
+        cell.references = [];
+    } else if (cell.body.type === "ImportDeclaration") {
+        //  This is correct?!?
+        cell.references = cell.body.specifiers
+            ? cell.body.specifiers.map(i => i.imported)
+            : [];
+    } else {
+        try {
+            cell.references = findReferences(cell, globals);
+        } catch (error: any) {
+            if (error.node) {
+                const loc = getLineInfo(input, error.node.start);
+                error.message += ` (${loc.line}:${loc.column})`;
+                error.pos = error.node.start;
+                error.loc = loc;
+                delete error.node;
+            }
+            throw error;
+        }
+    }
+    return cell;
+}
+
+// Find features: file attachments, secrets, database clients.
+// Check for illegal references to arguments.
+// Check for illegal assignments to global references.
+function parseFeatures(cell, input) {
+    if (cell.body && cell.body.type !== "ImportDeclaration") {
+        try {
+            cell.fileAttachments = findFeatures(cell, "FileAttachment");
+            cell.databaseClients = findFeatures(cell, "DatabaseClient");
+            cell.secrets = findFeatures(cell, "Secret");
+        } catch (error: any) {
+            if (error.node) {
+                const loc = getLineInfo(input, error.node.start);
+                error.message += ` (${loc.line}:${loc.column})`;
+                error.pos = error.node.start;
+                error.loc = loc;
+                delete error.node;
+            }
+            throw error;
+        }
+    } else {
+        cell.fileAttachments = new Map();
+        cell.databaseClients = new Map();
+        cell.secrets = new Map();
+    }
+    return cell;
+}
+
+class ModuleParser extends CellParser {
+
+    parseTopLevel(node: { cells?: Cell[] }) {
+        if (!node.cells) node.cells = [];
+        // @ts-ignore
+        while (this.type !== tokTypes.eof) {
+            // @ts-ignore
+            const cell: Cell = this.parseCell(this.startNode());
+            // @ts-ignore
+            cell.input = this.input;
+            node.cells.push(cell);
+        }
+        // @ts-ignore
+        this.next();
+        // @ts-ignore
+        return this.finishNode(node, "Program");
+    }
+}
+
+// @ts-ignore
+export function parseModule(input, { globals }: { globals: any } = {}) {
+    // @ts-ignore
+    const program = ModuleParser.parse(input, { ecmaVersion: 2020 });
+    for (const cell of program.cells) {
+        parseReferences(cell, input, globals);
+        parseFeatures(cell, input);
+    }
+    return program;
+}
+
+export interface Cell extends Node {
+    type: "Cell";
+    id: Expression;
+    text: string;
+    body?: Statement | ModuleDeclaration | Expression;
+    references: unknown[];
+    async: boolean;
+    generator: boolean;
+    strict: boolean;
+}
+
+export function splitModule(input: string): Cell[] {
+    return (ModuleParser as any)
+        .parse(input, { ecmaVersion: "latest" })
+        .cells.map((cell: any) => ({
+            type: "Cell",
+            text: input.substring(cell.start, cell.end),
+            start: cell.start,
+            end: cell.end
+        }));
+}
+
+export {
+    type Node,
+    ancestor,
+    type AncestorVisitors
+};
+
+export function parseCell(input: string): Cell {
+    return ohqParseCell(input);
+}
+
+export const walk: RecursiveVisitors<any> = ohqWalk;

package/src/types.ts

@@ -1,180 +1,180 @@
-export namespace ohq {
-
-    //  ObservableHQ Notebook Format  ---
-    export interface Owner {
-        id?: string;
-        github_login?: string;
-        avatar_url?: string;
-        login?: string;
-        name?: string;
-        bio?: string;
-        home_url?: string;
-        type?: string;
-        tier?: string;
-    }
-
-    export interface Creator {
-        id?: string;
-        github_login?: string;
-        avatar_url?: string;
-        login?: string;
-        name?: string;
-        bio?: string;
-        home_url?: string;
-        tier?: string;
-    }
-
-    export interface Author {
-        id?: string;
-        avatar_url?: string;
-        name?: string;
-        login?: string;
-        bio?: string;
-        home_url?: string;
-        github_login?: string;
-        tier?: string;
-        approved?: boolean;
-        description?: string;
-    }
-
-    export interface Owner2 {
-        id?: string;
-        github_login?: string;
-        avatar_url?: string;
-        login?: string;
-        name?: string;
-        bio?: string;
-        home_url?: string;
-        type?: string;
-        tier?: string;
-    }
-
-    export interface Collection {
-        id?: string;
-        type?: string;
-        slug?: string;
-        title?: string;
-        description?: string;
-        update_time?: Date;
-        pinned?: boolean;
-        ordered?: boolean;
-        custom_thumbnail?: any;
-        default_thumbnail?: string;
-        thumbnail?: string;
-        listing_count?: number;
-        parent_collection_count?: number;
-        owner?: Owner2;
-    }
-
-    export interface File {
-        id?: string;
-        url: string;
-        download_url?: string;
-        name: string;
-        create_time?: Date;
-        status?: string;
-        size?: number;
-        mime_type?: string;
-        content_encoding?: string;
-    }
-
-    export interface User {
-        id?: string;
-        github_login?: string;
-        avatar_url?: string;
-        login?: string;
-        name?: string;
-        bio?: string;
-        home_url?: string;
-        tier?: string;
-    }
-
-    export interface Comment {
-        id?: string;
-        content?: string;
-        node_id?: number;
-        create_time?: Date;
-        update_time?: any;
-        resolved?: boolean;
-        user?: User;
-    }
-
-    export interface Node {
-        id: string | number;
-        mode: string;
-        value: string;
-        pinned?: boolean;   // Show source code?
-        data?: any;
-        name?: string;
-        //  NodeEx  ---
-        start?: number;
-        end?: number;
-        private?: boolean;
-        outputs?: string[];
-    }
-
-    export interface Notebook {
-        id?: string;
-        slug?: any;
-        trashed?: boolean;
-        description?: string;
-        likes?: number;
-        publish_level?: string;
-        forks?: number;
-        fork_of?: any;
-        update_time?: Date;
-        publish_time?: Date;
-        publish_version?: number;
-        latest_version?: number;
-        thumbnail?: string;
-        default_thumbnail?: string;
-        roles?: any[];
-        sharing?: any;
-        owner?: Owner;
-        creator?: Creator;
-        authors?: Author[];
-        collections?: Collection[];
-        files: File[];
-        comments?: Comment[];
-        commenting_lock?: any;
-        suggestion_from?: any;
-        suggestions_to?: any[];
-        version?: number;
-        title?: string;
-        license?: string;
-        copyright?: string;
-        nodes: Node[];
-        resolutions?: any[];
-    }
-
-    //  @observablehq/runtime API  ---
-    export type InspectorFactory = (name?: string) => Inspector;
-
-    export interface Inspector {
-        _node?: HTMLDivElement;
-        pending();
-        fulfilled(value);
-        rejected(error);
-    }
-
-    export interface Runtime {
-        fileAttachments(func: (name: string) => ohq.File): any;
-        module(define?, inspector?: InspectorFactory): Module;
-        dispose(): void;
-    }
-
-    export interface Module {
-        derive(specifiers: string[] | { name: string, alias: string }[], source: any);
-        import(name: string, alias: string | undefined, mod: Module): Variable;
-        builtin(name: string, _: any);
-        variable(inspector?: Inspector): Variable;
-        value(name: string): Promise<any>;
-    }
-
-    export interface Variable {
-        delete();
-        define(name?: string, inputs?: string[], definition?: any);
-        import(name: string, otherModule: ohq.Module);
-        import(name: string, alias: string, otherModule: ohq.Module);
-    }
+export namespace ohq {
+
+    //  ObservableHQ Notebook Format  ---
+    export interface Owner {
+        id?: string;
+        github_login?: string;
+        avatar_url?: string;
+        login?: string;
+        name?: string;
+        bio?: string;
+        home_url?: string;
+        type?: string;
+        tier?: string;
+    }
+
+    export interface Creator {
+        id?: string;
+        github_login?: string;
+        avatar_url?: string;
+        login?: string;
+        name?: string;
+        bio?: string;
+        home_url?: string;
+        tier?: string;
+    }
+
+    export interface Author {
+        id?: string;
+        avatar_url?: string;
+        name?: string;
+        login?: string;
+        bio?: string;
+        home_url?: string;
+        github_login?: string;
+        tier?: string;
+        approved?: boolean;
+        description?: string;
+    }
+
+    export interface Owner2 {
+        id?: string;
+        github_login?: string;
+        avatar_url?: string;
+        login?: string;
+        name?: string;
+        bio?: string;
+        home_url?: string;
+        type?: string;
+        tier?: string;
+    }
+
+    export interface Collection {
+        id?: string;
+        type?: string;
+        slug?: string;
+        title?: string;
+        description?: string;
+        update_time?: Date;
+        pinned?: boolean;
+        ordered?: boolean;
+        custom_thumbnail?: any;
+        default_thumbnail?: string;
+        thumbnail?: string;
+        listing_count?: number;
+        parent_collection_count?: number;
+        owner?: Owner2;
+    }
+
+    export interface File {
+        id?: string;
+        url: string;
+        download_url?: string;
+        name: string;
+        create_time?: Date;
+        status?: string;
+        size?: number;
+        mime_type?: string;
+        content_encoding?: string;
+    }
+
+    export interface User {
+        id?: string;
+        github_login?: string;
+        avatar_url?: string;
+        login?: string;
+        name?: string;
+        bio?: string;
+        home_url?: string;
+        tier?: string;
+    }
+
+    export interface Comment {
+        id?: string;
+        content?: string;
+        node_id?: number;
+        create_time?: Date;
+        update_time?: any;
+        resolved?: boolean;
+        user?: User;
+    }
+
+    export interface Node {
+        id: string | number;
+        mode: string;
+        value: string;
+        pinned?: boolean;   // Show source code?
+        data?: any;
+        name?: string;
+        //  NodeEx  ---
+        start?: number;
+        end?: number;
+        private?: boolean;
+        outputs?: string[];
+    }
+
+    export interface Notebook {
+        id?: string;
+        slug?: any;
+        trashed?: boolean;
+        description?: string;
+        likes?: number;
+        publish_level?: string;
+        forks?: number;
+        fork_of?: any;
+        update_time?: Date;
+        publish_time?: Date;
+        publish_version?: number;
+        latest_version?: number;
+        thumbnail?: string;
+        default_thumbnail?: string;
+        roles?: any[];
+        sharing?: any;
+        owner?: Owner;
+        creator?: Creator;
+        authors?: Author[];
+        collections?: Collection[];
+        files: File[];
+        comments?: Comment[];
+        commenting_lock?: any;
+        suggestion_from?: any;
+        suggestions_to?: any[];
+        version?: number;
+        title?: string;
+        license?: string;
+        copyright?: string;
+        nodes: Node[];
+        resolutions?: any[];
+    }
+
+    //  @observablehq/runtime API  ---
+    export type InspectorFactory = (name?: string) => Inspector;
+
+    export interface Inspector {
+        _node?: HTMLDivElement;
+        pending();
+        fulfilled(value);
+        rejected(error);
+    }
+
+    export interface Runtime {
+        fileAttachments(func: (name: string) => ohq.File): any;
+        module(define?, inspector?: InspectorFactory): Module;
+        dispose(): void;
+    }
+
+    export interface Module {
+        derive(specifiers: string[] | { name: string, alias: string }[], source: any);
+        import(name: string, alias: string | undefined, mod: Module): Variable;
+        builtin(name: string, _: any);
+        variable(inspector?: Inspector): Variable;
+        value(name: string): Promise<any>;
+    }
+
+    export interface Variable {
+        delete();
+        define(name?: string, inputs?: string[], definition?: any);
+        import(name: string, otherModule: ohq.Module);
+        import(name: string, alias: string, otherModule: ohq.Module);
+    }
 }