maor errors

markbates · markbates · commit 3354c59a5022 · 2024-02-16T14:36:41.000-05:00
diff --git a/dist/cmd_error.d.ts b/dist/cmd_error.d.ts
@@ -0,0 +1,11 @@
+import { Parser } from "./parser";
+export declare class CmdError {
+    args: string[];
+    env: string[];
+    err: any;
+    exit: number;
+    filename: string;
+    output: string;
+    root: string;
+    constructor(data: any, parser?: Parser);
+}
diff --git a/dist/cmd_error.js b/dist/cmd_error.js
@@ -0,0 +1,22 @@
+import { Parser } from "./parser";
+export class CmdError {
+    constructor(data, parser) {
+        this.args = data.args;
+        this.env = data.env;
+        this.exit = data.exit;
+        this.filename = data.filename;
+        this.output = data.output;
+        this.root = data.root;
+        parser = parser || new Parser();
+        this.err = parser.parseError(data.err);
+    }
+}
+// args: [ 'ech', 'Hello World' ],
+// env: [
+// ],
+// err: 'exec: "ech": executable file not found in $PATH',
+// exit: -1,
+// filename: 'usage.md',
+// output: '',
+// root: '/Users/markbates/Library/CloudStorage/Dropbox/dev/guides/hypeviewer',
+// type: 'hype.CmdError'
diff --git a/dist/execute_error.d.ts b/dist/execute_error.d.ts
@@ -0,0 +1,7 @@
+import { Parser } from "./parser";
+export declare class ExecuteError {
+    filename: string;
+    root: string;
+    err: any;
+    constructor(data: any, parser?: Parser);
+}
diff --git a/dist/execute_error.js b/dist/execute_error.js
@@ -0,0 +1,9 @@
+import { Parser } from "./parser";
+export class ExecuteError {
+    constructor(data, parser) {
+        this.filename = data.filename;
+        this.root = data.root;
+        parser = parser || new Parser();
+        this.err = parser.parseError(data.err);
+    }
+}
diff --git a/dist/gotypes.d.ts b/dist/gotypes.d.ts
@@ -1,12 +1,15 @@
 declare let gotypes: {
     Body: string;
     Cmd: string;
+    CmdError: string;
     CmdResult: string;
     Element: string;
+    ExecuteError: string;
     FencedCode: string;
     Figcaption: string;
     Figure: string;
     Heading: string;
+    HypeError: string;
     Image: string;
     Include: string;
     InlineCode: string;
@@ -15,7 +18,9 @@ declare let gotypes: {
     OL: string;
     Page: string;
     Paragraph: string;
+    ParseError: string;
     Ref: string;
+    RunError: string;
     Snippet: string;
     SourceCode: string;
     TD: string;
diff --git a/dist/gotypes.js b/dist/gotypes.js
@@ -1,12 +1,15 @@
 let gotypes = {
     Body: "*hype.Body",
     Cmd: "*hype.Cmd",
+    CmdError: "hype.CmdError",
     CmdResult: "*hype.CmdResult",
     Element: "*hype.Element",
+    ExecuteError: "hype.ExecuteError",
     FencedCode: "*hype.FencedCode",
     Figcaption: "*hype.Figcaption",
     Figure: "*hype.Figure",
     Heading: "hype.Heading",
+    HypeError: "hype.HypeError",
     Image: "*hype.Image",
     Include: "*hype.Include",
     InlineCode: "*hype.InlineCode",
@@ -15,7 +18,9 @@ let gotypes = {
     OL: "*hype.OL",
     Page: "*hype.Page",
     Paragraph: "*hype.Paragraph",
+    ParseError: "hype.ParseError",
     Ref: "*hype.Ref",
+    RunError: "clam.RunError",
     Snippet: "hype.Snippet",
     SourceCode: "*hype.SourceCode",
     TD: "*hype.TD",
diff --git a/dist/index.js b/dist/index.js
@@ -4,12 +4,15 @@ import path from 'path-browserify';
 let gotypes = {
     Body: "*hype.Body",
     Cmd: "*hype.Cmd",
+    CmdError: "hype.CmdError",
     CmdResult: "*hype.CmdResult",
     Element: "*hype.Element",
+    ExecuteError: "hype.ExecuteError",
     FencedCode: "*hype.FencedCode",
     Figcaption: "*hype.Figcaption",
     Figure: "*hype.Figure",
     Heading: "hype.Heading",
+    HypeError: "hype.HypeError",
     Image: "*hype.Image",
     Include: "*hype.Include",
     InlineCode: "*hype.InlineCode",
@@ -18,7 +21,9 @@ let gotypes = {
     OL: "*hype.OL",
     Page: "*hype.Page",
     Paragraph: "*hype.Paragraph",
+    ParseError: "hype.ParseError",
     Ref: "*hype.Ref",
+    RunError: "clam.RunError",
     Snippet: "hype.Snippet",
     SourceCode: "*hype.SourceCode",
     TD: "*hype.TD",
@@ -607,6 +612,37 @@ function newUUID() {
     return `heading-${v4()}`;
 }
 
+class CmdError {
+    constructor(data, parser) {
+        this.args = data.args;
+        this.env = data.env;
+        this.exit = data.exit;
+        this.filename = data.filename;
+        this.output = data.output;
+        this.root = data.root;
+        parser = parser || new Parser();
+        this.err = parser.parseError(data.err);
+    }
+}
+// args: [ 'ech', 'Hello World' ],
+// env: [
+// ],
+// err: 'exec: "ech": executable file not found in $PATH',
+// exit: -1,
+// filename: 'usage.md',
+// output: '',
+// root: '/Users/markbates/Library/CloudStorage/Dropbox/dev/guides/hypeviewer',
+// type: 'hype.CmdError'
+
+class ExecuteError {
+    constructor(data, parser) {
+        this.filename = data.filename;
+        this.root = data.root;
+        parser = parser || new Parser();
+        this.err = parser.parseError(data.err);
+    }
+}
+
 class FencedCode extends Element {
     constructor(fc) {
         super(fc);
@@ -673,6 +709,15 @@ class Page extends Element {
     }
 }
 
+class ParseError {
+    constructor(data, parser) {
+        this.filename = data.filename;
+        this.root = data.root;
+        parser = parser || new Parser();
+        this.err = parser.parseError(data.err);
+    }
+}
+
 class Ref extends Element {
     constructor(r) {
         super(r);
@@ -776,6 +821,22 @@ class Parser {
         data.nodes = this.parseNodes(data.nodes);
         return new Document(data);
     }
+    parseError(data) {
+        switch (data.type) {
+            case gotypes.ExecuteError:
+                return new ExecuteError(data, this);
+            case gotypes.CmdError:
+                return new CmdError(data, this);
+            case gotypes.ParseError:
+                return new ParseError(data, this);
+            default:
+                if (data.type === undefined) {
+                    return data;
+                }
+                console.warn("parseError: unknown type: ", data.type);
+                return data;
+        }
+    }
     parseNodes(nodes = []) {
         let ret = [];
         nodes.forEach((n) => {
diff --git a/dist/parse_error.d.ts b/dist/parse_error.d.ts
@@ -0,0 +1,7 @@
+import { Parser } from "./parser";
+export declare class ParseError {
+    filename: string;
+    root: string;
+    err: any;
+    constructor(data: any, parser?: Parser);
+}
diff --git a/dist/parse_error.js b/dist/parse_error.js
@@ -0,0 +1,9 @@
+import { Parser } from "./parser";
+export class ParseError {
+    constructor(data, parser) {
+        this.filename = data.filename;
+        this.root = data.root;
+        parser = parser || new Parser();
+        this.err = parser.parseError(data.err);
+    }
+}
diff --git a/dist/parser.d.ts b/dist/parser.d.ts
@@ -3,5 +3,6 @@ export declare class Parser {
     handlers: any;
     constructor();
     parse(data: any): Document;
+    parseError(data: any): any;
     private parseNodes;
 }
diff --git a/dist/parser.js b/dist/parser.js
@@ -1,7 +1,9 @@
-import { Document } from "./document";
 import { Cmd } from "./cmd";
+import { CmdError } from "./cmd_error";
 import { CmdResult } from "./cmd_result";
+import { Document } from "./document";
 import { Element } from "./element";
+import { ExecuteError } from "./execute_error";
 import { FencedCode } from "./fenced_code";
 import { FigCaption } from "./fig_caption";
 import { Figure } from "./figure";
@@ -13,6 +15,7 @@ import { LI } from "./li";
 import { Link } from "./link";
 import { OL } from "./ol";
 import { Page } from "./page";
+import { ParseError } from "./parse_error";
 import { Ref } from "./ref";
 import { Snippet } from "./snippet";
 import { SourceCode } from "./source_code";
@@ -56,6 +59,22 @@ export class Parser {
         data.nodes = this.parseNodes(data.nodes);
         return new Document(data);
     }
+    parseError(data) {
+        switch (data.type) {
+            case gotypes.ExecuteError:
+                return new ExecuteError(data, this);
+            case gotypes.CmdError:
+                return new CmdError(data, this);
+            case gotypes.ParseError:
+                return new ParseError(data, this);
+            default:
+                if (data.type === undefined) {
+                    return data;
+                }
+                console.warn("parseError: unknown type: ", data.type);
+                return data;
+        }
+    }
     parseNodes(nodes = []) {
         let ret = [];
         nodes.forEach((n) => {
diff --git a/index.d.ts b/index.d.ts
@@ -66,6 +66,7 @@ declare class Parser {
     handlers: any;
     constructor();
     parse(data: any): Document;
+    parseError(data: any): any;
     private parseNodes;
 }
 
@@ -573,12 +574,15 @@ declare let atoms: {
 declare let gotypes: {
     Body: string;
     Cmd: string;
+    CmdError: string;
     CmdResult: string;
     Element: string;
+    ExecuteError: string;
     FencedCode: string;
     Figcaption: string;
     Figure: string;
     Heading: string;
+    HypeError: string;
     Image: string;
     Include: string;
     InlineCode: string;
@@ -587,7 +591,9 @@ declare let gotypes: {
     OL: string;
     Page: string;
     Paragraph: string;
+    ParseError: string;
     Ref: string;
+    RunError: string;
     Snippet: string;
     SourceCode: string;
     TD: string;
diff --git a/module.md b/module.md
@@ -1,5 +1,5 @@
 # HypeJS
 
-asdfasdfa
+asdfasdf
 
-<code src="src/document.ts"></code>
+<include src="usage.md"></include>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@gopherguides/hypejs",
-    "version": "0.2.3",
+    "version": "0.2.4",
     "author": "Gopher Guides <info@gopherguides.com>",
     "description": "kA TypeScript/JavaScript client for Hype JSON",
     "license": "CC-BY-NC-SA-4.0",
diff --git a/src/cmd_error.ts b/src/cmd_error.ts
@@ -0,0 +1,33 @@
+import { ParseError } from "./parse_error";
+import { Parser } from "./parser";
+
+export class CmdError {
+    args: string[];
+    env: string[];
+    err: any;
+    exit: number;
+    filename: string;
+    output: string;
+    root: string;
+
+    constructor(data: any, parser?: Parser) {
+        this.args = data.args;
+        this.env = data.env;
+        this.exit = data.exit;
+        this.filename = data.filename;
+        this.output = data.output;
+        this.root = data.root;
+
+        parser = parser || new Parser();
+        this.err = parser.parseError(data.err);
+    }
+}
+// args: [ 'ech', 'Hello World' ],
+// env: [
+// ],
+// err: 'exec: "ech": executable file not found in $PATH',
+// exit: -1,
+// filename: 'usage.md',
+// output: '',
+// root: '/Users/markbates/Library/CloudStorage/Dropbox/dev/guides/hypeviewer',
+// type: 'hype.CmdError'
diff --git a/src/execute_error.ts b/src/execute_error.ts
@@ -0,0 +1,16 @@
+import { ParseError } from "./parse_error";
+import { Parser } from "./parser";
+
+export class ExecuteError {
+    filename: string;
+    root: string;
+    err: any;
+
+    constructor(data: any, parser?: Parser) {
+        this.filename = data.filename;
+        this.root = data.root;
+
+        parser = parser || new Parser();
+        this.err = parser.parseError(data.err);
+    }
+}
diff --git a/src/gotypes.ts b/src/gotypes.ts
diff --git a/src/index.ts b/src/index.ts
diff --git a/src/parse_error.spec.ts b/src/parse_error.spec.ts
diff --git a/src/parse_error.ts b/src/parse_error.ts
diff --git a/src/parser.ts b/src/parser.ts
diff --git a/src/testdata/errors/cmd.json b/src/testdata/errors/cmd.json
diff --git a/src/testdata/errors/parse.json b/src/testdata/errors/parse.json
diff --git a/usage.md b/usage.md

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,6 @@ export declare class Parser {`
`3`	`3`	`handlers: any;`
`4`	`4`	`constructor();`
`5`	`5`	`parse(data: any): Document;`
	`6`	`+ parseError(data: any): any;`
`6`	`7`	`private parseNodes;`
`7`	`8`	`}`