@voxgig/apidef 0.3.0 → 1.1.0

package/bin/{run-apidef.js → voxgig-apidef}

@@ -15,33 +15,35 @@ const { ApiDef } = require('../dist/apidef.js')
 
 let CONSOLE = console
 
+run()
 
-try {
-  let options = resolveOptions()
 
-  if(options.version) {
-    version()
-  }
+async function run() {
+  try {
+    let options = resolveOptions()
 
-  if(options.help) {
-    help()
-  }
+    if(options.version) {
+      version()
+    }
 
-  if(options.version || options.help) {
-    exit()
-  }
+    if(options.help) {
+      help()
+    }
+
+    if(options.version || options.help) {
+      exit()
+    }
 
-  options = validateOptions(options)
+    options = validateOptions(options)
 
-  generate(options)
-  
-}
-catch(err) {
-  handleError(err)
+    await generate(options)
+  }
+  catch(err) {
+    handleError(err)
+  }
 }
 
 
-
 function exit(err) {
   let code = 0
   if(err) {
@@ -51,7 +53,7 @@ function exit(err) {
 }
 
 
-function generate(options) {
+async function generate(options) {
   const apidef = new ApiDef({
     debug: options.debug
   })
@@ -64,12 +66,11 @@ function generate(options) {
   }
 
   if(options.watch) {
-    apidef.watch(spec)
+    await apidef.watch(spec)
   }
   else {
-    apidef.generate(spec)
+    await apidef.generate(spec)
   }
-
 }
 
 
@@ -159,10 +160,9 @@ function validateOptions(rawOptions) {
 }
 
 
-function handleError(err) {
+async function handleError(err) {
   CONSOLE.log('Voxgig API Definition Error:')
   CONSOLE.log(err)
-  
   exit(err)
 }
 

package/dist/apidef.d.ts

@@ -1,4 +1,4 @@
-import Pino from 'pino';
+import { Pino } from '@voxgig/util';
 type ApiDefOptions = {
     fs?: any;
     pino?: ReturnType<typeof Pino>;
@@ -9,9 +9,10 @@ type ApiDefSpec = {
     model: string;
     kind: string;
     meta: Record<string, any>;
+    guide: any;
 };
 declare function ApiDef(opts?: ApiDefOptions): {
-    watch: (spec: any) => Promise<void>;
+    watch: (spec: ApiDefSpec) => Promise<void>;
     generate: (spec: ApiDefSpec) => Promise<{
         ok: boolean;
         model: {
@@ -22,7 +23,7 @@ declare function ApiDef(opts?: ApiDefOptions): {
                 def: {};
             };
         };
-    }>;
+    } | undefined>;
 };
-export type { ApiDefOptions, };
+export type { ApiDefOptions, ApiDefSpec, };
 export { ApiDef, };

package/dist/apidef.js

@@ -33,23 +33,11 @@ const node_path_1 = __importDefault(require("node:path"));
 const openapi_core_1 = require("@redocly/openapi-core");
 const chokidar_1 = require("chokidar");
 const aontu_1 = require("aontu");
-const pino_1 = __importDefault(require("pino"));
-const pino_pretty_1 = __importDefault(require("pino-pretty"));
+const util_1 = require("@voxgig/util");
 const transform_1 = require("./transform");
 function ApiDef(opts = {}) {
     const fs = opts.fs || Fs;
-    let pino = opts.pino;
-    if (null == pino) {
-        let pretty = (0, pino_pretty_1.default)({ sync: true });
-        const level = null == opts.debug ? 'info' :
-            true === opts.debug ? 'debug' :
-                'string' == typeof opts.debug ? opts.debug :
-                    'info';
-        pino = (0, pino_1.default)({
-            name: 'apidef',
-            level,
-        }, pretty);
-    }
+    const pino = (0, util_1.prettyPino)('apidef', opts);
     const log = pino.child({ cmp: 'apidef' });
     async function watch(spec) {
         log.info({ point: 'watch-start' });
@@ -62,12 +50,14 @@ function ApiDef(opts = {}) {
         });
         log.trace({ watch: 'add', what: 'def', file: spec.def });
         fsw.add(spec.def);
-        log.trace({ watch: 'add', what: 'guide', file: spec.guilde });
+        log.trace({ watch: 'add', what: 'guide', file: spec.guide });
         fsw.add(spec.guide);
     }
     async function generate(spec) {
         const start = Date.now();
-        log.info({ point: 'generate-start', start });
+        // TODO: validate spec
+        const defpath = node_path_1.default.normalize(spec.def);
+        log.info({ point: 'generate-start', note: 'defpath', defpath, start });
         log.debug({ point: 'generate-spec', spec });
         // TODO: Validate spec
         const ctx = {
@@ -76,9 +66,12 @@ function ApiDef(opts = {}) {
             guide: {},
             opts,
             util: { fixName: transform_1.fixName },
-            defpath: node_path_1.default.dirname(spec.def)
+            defpath: node_path_1.default.dirname(defpath)
         };
         const guide = await resolveGuide(spec, opts);
+        if (null == guide) {
+            return;
+        }
         log.debug({ point: 'guide', guide });
         ctx.guide = guide;
         const transformSpec = await (0, transform_1.resolveTransforms)(ctx);
@@ -88,7 +81,7 @@ function ApiDef(opts = {}) {
             source = fs.readFileSync(spec.def, 'utf8');
         }
         catch (err) {
-            log.error({ read: 'fail', what: 'def', file: spec.def, err });
+            log.error({ read: 'fail', what: 'def', file: defpath, err });
             throw err;
         }
         const config = await (0, openapi_core_1.createConfig)({});
@@ -101,7 +94,7 @@ function ApiDef(opts = {}) {
             });
         }
         catch (err) {
-            log.error({ parse: 'fail', what: 'openapi', file: spec.def, err });
+            log.error({ parse: 'fail', what: 'openapi', file: defpath, err });
             throw err;
         }
         const model = {
@@ -137,23 +130,7 @@ function ApiDef(opts = {}) {
         let modelDefSrc = JSON.stringify(modelDef, null, 2);
         modelDefSrc = modelDefSrc.substring(1, modelDefSrc.length - 1);
         writeChanged('def-model', defFilePath, modelDefSrc);
-        /*
-        let existingSrc: string = ''
-        if (fs.existsSync(defFilePath)) {
-          existingSrc = fs.readFileSync(defFilePath, 'utf8')
-        }
-    
-        let writeModelDef = existingSrc !== modelDefSrc
-        // console.log('APIDEF', writeModelDef)
-    
-        // Only write the model def if it has changed
-        if (writeModelDef) {
-          fs.writeFileSync(
-            defFilePath,
-            modelDefSrc
-          )
-        }
-        */
+        log.info({ point: 'generate-end', note: 'success', break: true });
         return {
             ok: true,
             model,
@@ -165,6 +142,7 @@ function ApiDef(opts = {}) {
         let action = '';
         try {
             let existingContent = '';
+            path = node_path_1.default.normalize(path);
             exists = fs.existsSync(path);
             if (exists) {
                 action = 'read';
@@ -172,6 +150,8 @@ function ApiDef(opts = {}) {
             }
             changed = existingContent !== content;
             log.info({
+                point: 'write-' + what,
+                note: 'changed,file',
                 write: 'file', what, skip: !changed, exists, changed,
                 contentLength: content.length, file: path
             });
@@ -235,11 +215,21 @@ guide: control: transform: openapi: order: \`
         const root = (0, aontu_1.Aontu)(src, aopts);
         const hasErr = root.err && 0 < root.err.length;
         if (hasErr) {
-            const err = new Error('Guide parse error:\n' +
-                (root.err.map((pe) => pe.msg)).join('\n'));
-            log.error({ fail: 'parse', what: 'guide', file: path, err });
-            err.errs = () => root.err;
-            throw err;
+            for (let serr of root.err) {
+                let err = new Error('Guide model: ' + serr.msg);
+                err.cause$ = [serr];
+                if ('syntax' === serr.why) {
+                    err.uxmsg$ = true;
+                }
+                log.error({ fail: 'parse', point: 'guide-parse', file: path, err });
+                if (err.uxmsg$) {
+                    return;
+                }
+                else {
+                    err.rooterrs$ = root.err;
+                    throw err;
+                }
+            }
         }
         let genctx = new aontu_1.Context({ root });
         const guide = spec.guideModel = root.gen(genctx);
@@ -255,14 +245,6 @@ guide: control: transform: openapi: order: \`
         spec.guideModelPath = node_path_1.default.join(pathParts.dir, pathParts.name + '.json');
         const updatedSrc = JSON.stringify(guide, null, 2);
         writeChanged('guide-model', spec.guideModelPath, updatedSrc);
-        // console.log('APIDEF resolveGuide write', spec.guideModelPath, src !== updatedSrc)
-        // let existingSrc = ''
-        // if (fs.existsSync(spec.guideModelPath)) {
-        //   existingSrc = fs.readFileSync(spec.guideModelPath, 'utf8')
-        // }
-        // if (existingSrc !== updatedSrc) {
-        //   fs.writeFileSync(spec.guideModelPath, updatedSrc)
-        // }
         return guide;
     }
     return {

package/dist/apidef.js.map

@@ -1 +1 @@
-{"version":3,"file":"apidef.js","sourceRoot":"","sources":["../src/apidef.ts"],"names":[],"mappings":";AAAA,4CAA4C;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyV1C,wBAAM;AAvVR,4CAA6B;AAC7B,0DAA4B;AAG5B,wDAAsE;AACtE,uCAAoC;AACpC,iCAAsC;AACtC,gDAAuB;AACvB,8DAAoC;AAKpC,2CAIoB;AAkBpB,SAAS,MAAM,CAAC,OAAsB,EAAE;IACtC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,EAAE,CAAA;IACxB,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;IAEpB,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACjB,IAAI,MAAM,GAAG,IAAA,qBAAU,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;QACvC,MAAM,KAAK,GAAG,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACzC,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBAC7B,QAAQ,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAC1C,MAAM,CAAA;QAEZ,IAAI,GAAG,IAAA,cAAI,EAAC;YACV,IAAI,EAAE,QAAQ;YACd,KAAK;SACN,EACC,MAAM,CACP,CAAA;IACH,CAAC;IAGD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAA;IAGzC,KAAK,UAAU,KAAK,CAAC,IAAS;QAC5B,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAA;QAClC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAA;QAExC,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAA;QAEpB,MAAM,GAAG,GAAG,IAAI,oBAAS,EAAE,CAAA;QAE3B,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE;YAClC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;YAC7C,QAAQ,CAAC,IAAI,CAAC,CAAA;QAChB,CAAC,CAAC,CAAA;QAEF,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;QACxD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEjB,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;QAC7D,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACrB,CAAC;IAGD,KAAK,UAAU,QAAQ,CAAC,IAAgB;QACtC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAExB,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC,CAAA;QAC5C,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAA;QAE3C,sBAAsB;QACtB,MAAM,GAAG,GAAG;YACV,GAAG;YACH,IAAI;YACJ,KAAK,EAAE,EAAE;YACT,IAAI;YACJ,IAAI,EAAE,EAAE,OAAO,EAAP,mBAAO,EAAE;YACjB,OAAO,EAAE,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;SAChC,CAAA;QAED,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QAC5C,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAA;QAEpC,GAAG,CAAC,KAAK,GAAG,KAAK,CAAA;QACjB,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAiB,EAAC,GAAG,CAAC,CAAA;QAClD,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAA;QAGtD,IAAI,MAAM,CAAA;QACV,IAAI,CAAC;YACH,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QAC5C,CAAC;QACD,OAAO,GAAQ,EAAE,CAAC;YAChB,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;YAC7D,MAAM,GAAG,CAAA;QACX,CAAC;QAGD,MAAM,MAAM,GAAG,MAAM,IAAA,2BAAY,EAAC,EAAE,CAAC,CAAA;QACrC,IAAI,MAAM,CAAA;QAEV,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,IAAA,+BAAgB,EAAC;gBAC9B,MAAM;gBACN,MAAM;gBACN,WAAW,EAAE,IAAI;aAClB,CAAC,CAAA;QACJ,CAAC;QACD,OAAO,GAAQ,EAAE,CAAC;YAChB,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;YAClE,MAAM,GAAG,CAAA;QACX,CAAC;QAGD,MAAM,KAAK,GAAG;YACZ,IAAI,EAAE;gBACJ,GAAG,EAAE;oBACH,MAAM,EAAE,EAAE;iBACX;gBACD,GAAG,EAAE,EAAE;aACR;SACF,CAAA;QAED,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAA;YAChC,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAiB,EAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,CAAC,CAAA;YAE7E,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC;gBACtB,GAAG,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAA;gBACxE,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;YAC3D,CAAC;iBACI,CAAC;gBACJ,GAAG,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAA;YAC5E,CAAC;QACH,CAAC;QACD,OAAO,GAAQ,EAAE,CAAC;YAChB,GAAG,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAA;YACtD,MAAM,GAAG,CAAA;QACX,CAAC;QAED,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;QAClD,IAAI,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QAChD,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QAErD,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QAG/C,MAAM,aAAa,GAAG,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC9C,MAAM,WAAW,GAAG,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAA;QAE1D,MAAM,QAAQ,GAAG,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;QAClD,IAAI,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QACnD,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QAE9D,YAAY,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;QAEnD;;;;;;;;;;;;;;;;UAgBE;QAEF,OAAO;YACL,EAAE,EAAE,IAAI;YACR,KAAK;SACN,CAAA;IACH,CAAC;IAID,SAAS,YAAY,CAAC,IAAY,EAAE,IAAY,EAAE,OAAe;QAC/D,IAAI,MAAM,GAAG,KAAK,CAAA;QAClB,IAAI,OAAO,GAAG,KAAK,CAAA;QACnB,IAAI,MAAM,GAAG,EAAE,CAAA;QACf,IAAI,CAAC;YACH,IAAI,eAAe,GAAW,EAAE,CAAA;YAChC,MAAM,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YAE5B,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,GAAG,MAAM,CAAA;gBACf,eAAe,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;YACjD,CAAC;YAED,OAAO,GAAG,eAAe,KAAK,OAAO,CAAA;YAErC,GAAG,CAAC,IAAI,CAAC;gBACP,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO;gBACpD,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI;aAC1C,CAAC,CAAA;YAEF,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,GAAG,OAAO,CAAA;gBAChB,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;YACjC,CAAC;QACH,CAAC;QACD,OAAO,GAAQ,EAAE,CAAC;YAChB,GAAG,CAAC,KAAK,CAAC;gBACR,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO;gBAC/C,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG;aACnC,CAAC,CAAA;YACF,MAAM,GAAG,CAAA;QACX,CAAC;IACH,CAAC;IAID,KAAK,UAAU,YAAY,CAAC,IAAS,EAAE,KAAU;QAC/C,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,GAAG,eAAe,CAAA;QACzC,CAAC;QAED,MAAM,IAAI,GAAG,mBAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACvC,IAAI,GAAW,CAAA;QAEf,IAAI,MAAM,GAAG,EAAE,CAAA;QACf,IAAI,MAAM,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC;YAEH,MAAM,GAAG,QAAQ,CAAA;YACjB,IAAI,MAAM,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YAEhC,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;YAE9D,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,GAAG,MAAM,CAAA;gBACf,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;YACrC,CAAC;iBACI,CAAC;gBACJ,GAAG,GAAG;;;;;;;;;;;;;;;;;CAiBb,CAAA;gBACO,MAAM,GAAG,OAAO,CAAA;gBAChB,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;YAC7B,CAAC;QACH,CAAC;QACD,OAAO,GAAQ,EAAE,CAAC;YAChB,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAA;YACnE,MAAM,GAAG,CAAA;QACX,CAAC;QAGD,MAAM,KAAK,GAAG,EAAE,IAAI,EAAE,CAAA;QACtB,MAAM,IAAI,GAAG,IAAA,aAAK,EAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAA;QAE9C,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,GAAG,GAAQ,IAAI,KAAK,CAAC,sBAAsB;gBAC/C,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAO,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;YACjD,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;YAC5D,GAAG,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAA;YACzB,MAAM,GAAG,CAAA;QACX,CAAC;QAED,IAAI,MAAM,GAAG,IAAI,eAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAEhD,2BAA2B;QAC3B,IAAI,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YACxC,MAAM,GAAG,GAAQ,IAAI,KAAK,CAAC,sBAAsB;gBAC/C,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAO,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;YACnD,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;YAC5D,GAAG,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAA;YAC3B,MAAM,GAAG,CAAA;QACX,CAAC;QAED,MAAM,SAAS,GAAG,mBAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAClC,IAAI,CAAC,cAAc,GAAG,mBAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,GAAG,OAAO,CAAC,CAAA;QAExE,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QAEjD,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAA;QAE5D,oFAAoF;QACpF,uBAAuB;QACvB,4CAA4C;QAC5C,+DAA+D;QAC/D,IAAI;QAEJ,oCAAoC;QACpC,sDAAsD;QACtD,IAAI;QAEJ,OAAO,KAAK,CAAA;IACd,CAAC;IAGD,OAAO;QACL,KAAK;QACL,QAAQ;KACT,CAAA;AACH,CAAC"}
+{"version":3,"file":"apidef.js","sourceRoot":"","sources":["../src/apidef.ts"],"names":[],"mappings":"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"}

package/dist/transform.js

@@ -32,7 +32,7 @@ async function resolveTransforms(ctx) {
         .split(/\s*,\s*/)
         .map((t) => t.trim())
         .filter((t) => '' != t);
-    log.info({ what: 'transform', order: transformNames });
+    log.info({ point: 'transform', note: 'order', order: transformNames });
     for (const tn of transformNames) {
         log.debug({ what: 'transform', transform: tn });
         const transform = await resolveTransform(tn, ctx);

package/dist/transform.js.map

@@ -1 +1 @@
-{"version":3,"file":"transform.js","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transform.js","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/apidef",
-  "version": "0.3.0",
+  "version": "1.1.0",
   "main": "dist/apidef.js",
   "type": "commonjs",
   "types": "dist/apidef.d.ts",
@@ -16,7 +16,7 @@
     "url": "git://github.com/voxgig/apidef.git"
   },
   "bin": {
-    "apidef": "bin/run-apidef.js"
+    "voxgig-apidef": "bin/voxgig-apidef"
   },
   "scripts": {
     "test": "node --enable-source-maps --test dist-test",
@@ -41,20 +41,21 @@
   "devDependencies": {
     "@hapi/code": "^9.0.3",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "22.8.2",
-    "aontu": "^0.23.0",
+    "@types/node": "22.9.0",
+    "aontu": "^0.25.1",
     "esbuild": "^0.24.0",
     "json-schema-to-ts": "^3.1.1",
     "memfs": "^4.14.0",
     "typescript": "^5.6.3"
   },
   "dependencies": {
-    "@redocly/openapi-core": "^1.25.9",
+    "@redocly/openapi-core": "^1.25.11",
+    "@voxgig/util": "^0.0.5",
     "chokidar": "^4.0.1",
     "gubu": "^8.3.0",
-    "jostraca": "^0.7.7",
+    "jostraca": "^0.8.0",
     "pino": "^9.5.0",
-    "pino-pretty": "^11.3.0",
+    "pino-pretty": "^13.0.0",
     "sonic-boom": "^4.2.0"
   }
 }

package/src/apidef.ts

@@ -7,10 +7,8 @@ import Path from 'node:path'
 import { bundleFromString, createConfig } from '@redocly/openapi-core'
 import { FSWatcher } from 'chokidar'
 import { Aontu, Context } from 'aontu'
-import Pino from 'pino'
-import PinoPretty from 'pino-pretty'
-
 
+import { prettyPino, Pino } from '@voxgig/util'
 
 
 import {
@@ -32,33 +30,18 @@ type ApiDefSpec = {
   model: string,
   kind: string,
   meta: Record<string, any>,
+  guide: any
 }
 
 
 function ApiDef(opts: ApiDefOptions = {}) {
   const fs = opts.fs || Fs
-  let pino = opts.pino
-
-  if (null == pino) {
-    let pretty = PinoPretty({ sync: true })
-    const level = null == opts.debug ? 'info' :
-      true === opts.debug ? 'debug' :
-        'string' == typeof opts.debug ? opts.debug :
-          'info'
-
-    pino = Pino({
-      name: 'apidef',
-      level,
-    },
-      pretty
-    )
-  }
-
+  const pino = prettyPino('apidef', opts)
 
   const log = pino.child({ cmp: 'apidef' })
 
 
-  async function watch(spec: any) {
+  async function watch(spec: ApiDefSpec) {
     log.info({ point: 'watch-start' })
     log.debug({ point: 'watch-spec', spec })
 
@@ -74,7 +57,7 @@ function ApiDef(opts: ApiDefOptions = {}) {
     log.trace({ watch: 'add', what: 'def', file: spec.def })
     fsw.add(spec.def)
 
-    log.trace({ watch: 'add', what: 'guide', file: spec.guilde })
+    log.trace({ watch: 'add', what: 'guide', file: spec.guide })
     fsw.add(spec.guide)
   }
 
@@ -82,7 +65,11 @@ function ApiDef(opts: ApiDefOptions = {}) {
   async function generate(spec: ApiDefSpec) {
     const start = Date.now()
 
-    log.info({ point: 'generate-start', start })
+    // TODO: validate spec
+
+    const defpath = Path.normalize(spec.def)
+
+    log.info({ point: 'generate-start', note: 'defpath', defpath, start })
     log.debug({ point: 'generate-spec', spec })
 
     // TODO: Validate spec
@@ -92,10 +79,18 @@ function ApiDef(opts: ApiDefOptions = {}) {
       guide: {},
       opts,
       util: { fixName },
-      defpath: Path.dirname(spec.def)
+      defpath: Path.dirname(defpath)
     }
 
+
+
     const guide = await resolveGuide(spec, opts)
+
+    if (null == guide) {
+      return
+    }
+
+
     log.debug({ point: 'guide', guide })
 
     ctx.guide = guide
@@ -108,7 +103,7 @@ function ApiDef(opts: ApiDefOptions = {}) {
       source = fs.readFileSync(spec.def, 'utf8')
     }
     catch (err: any) {
-      log.error({ read: 'fail', what: 'def', file: spec.def, err })
+      log.error({ read: 'fail', what: 'def', file: defpath, err })
       throw err
     }
 
@@ -124,7 +119,7 @@ function ApiDef(opts: ApiDefOptions = {}) {
       })
     }
     catch (err: any) {
-      log.error({ parse: 'fail', what: 'openapi', file: spec.def, err })
+      log.error({ parse: 'fail', what: 'openapi', file: defpath, err })
       throw err
     }
 
@@ -171,23 +166,7 @@ function ApiDef(opts: ApiDefOptions = {}) {
 
     writeChanged('def-model', defFilePath, modelDefSrc)
 
-    /*
-    let existingSrc: string = ''
-    if (fs.existsSync(defFilePath)) {
-      existingSrc = fs.readFileSync(defFilePath, 'utf8')
-    }
-
-    let writeModelDef = existingSrc !== modelDefSrc
-    // console.log('APIDEF', writeModelDef)
-
-    // Only write the model def if it has changed
-    if (writeModelDef) {
-      fs.writeFileSync(
-        defFilePath,
-        modelDefSrc
-      )
-    }
-    */
+    log.info({ point: 'generate-end', note: 'success', break: true })
 
     return {
       ok: true,
@@ -203,6 +182,8 @@ function ApiDef(opts: ApiDefOptions = {}) {
     let action = ''
     try {
       let existingContent: string = ''
+      path = Path.normalize(path)
+
       exists = fs.existsSync(path)
 
       if (exists) {
@@ -213,6 +194,8 @@ function ApiDef(opts: ApiDefOptions = {}) {
       changed = existingContent !== content
 
       log.info({
+        point: 'write-' + what,
+        note: 'changed,file',
         write: 'file', what, skip: !changed, exists, changed,
         contentLength: content.length, file: path
       })
@@ -282,17 +265,29 @@ guide: control: transform: openapi: order: \`
       throw err
     }
 
-
     const aopts = { path }
     const root = Aontu(src, aopts)
     const hasErr = root.err && 0 < root.err.length
 
     if (hasErr) {
-      const err: any = new Error('Guide parse error:\n' +
-        (root.err.map((pe: any) => pe.msg)).join('\n'))
-      log.error({ fail: 'parse', what: 'guide', file: path, err })
-      err.errs = () => root.err
-      throw err
+      for (let serr of root.err) {
+        let err: any = new Error('Guide model: ' + serr.msg)
+        err.cause$ = [serr]
+
+        if ('syntax' === serr.why) {
+          err.uxmsg$ = true
+        }
+
+        log.error({ fail: 'parse', point: 'guide-parse', file: path, err })
+
+        if (err.uxmsg$) {
+          return
+        }
+        else {
+          err.rooterrs$ = root.err
+          throw err
+        }
+      }
     }
 
     let genctx = new Context({ root })
@@ -314,16 +309,6 @@ guide: control: transform: openapi: order: \`
 
     writeChanged('guide-model', spec.guideModelPath, updatedSrc)
 
-    // console.log('APIDEF resolveGuide write', spec.guideModelPath, src !== updatedSrc)
-    // let existingSrc = ''
-    // if (fs.existsSync(spec.guideModelPath)) {
-    //   existingSrc = fs.readFileSync(spec.guideModelPath, 'utf8')
-    // }
-
-    // if (existingSrc !== updatedSrc) {
-    //   fs.writeFileSync(spec.guideModelPath, updatedSrc)
-    // }
-
     return guide
   }
 
@@ -339,6 +324,7 @@ guide: control: transform: openapi: order: \`
 
 export type {
   ApiDefOptions,
+  ApiDefSpec,
 }
 
 

package/src/transform.ts

@@ -71,7 +71,7 @@ async function resolveTransforms(ctx: TransformCtx): Promise<TransformSpec> {
     .map((t: string) => t.trim())
     .filter((t: string) => '' != t)
 
-  log.info({ what: 'transform', order: transformNames })
+  log.info({ point: 'transform', note: 'order', order: transformNames })
 
   for (const tn of transformNames) {
     log.debug({ what: 'transform', transform: tn })

package/bin/run-apidef.js~

@@ -1,330 +0,0 @@
-#!/usr/bin/env node
-
-const Path = require('node:path')
-const { statSync } = require('node:fs')
-const { parseArgs } = require('node:util')
-
-const { Gubu, Fault } = require('gubu')
-const { Aontu, Context } = require('aontu')
-
-
-const Pkg = require('../package.json')
-
-const { CreateSdkGen } = require('../dist/create-sdkgen.js') 
-
-// const { Root } = require('../dist/standard/Root')
-const rootpath = require.resolve('../dist/standard/Root')
-
-let DEBUG = false
-let CONSOLE = console
-
-
-try {
-  let options = resolveOptions()
-
-  if(options.debug) {
-    DEBUG = true
-  }
-
-  if(options.version) {
-    version()
-  }
-
-  if(options.help) {
-    help()
-  }
-
-  if(options.version || options.help) {
-    exit()
-  }
-
-  options = validateOptions(options)
-
-  generate(options)
-  
-}
-catch(err) {
-  handleError(err)
-}
-
-
-
-function exit(err) {
-  let code = 0
-  if(err) {
-    code = 1
-  }
-  process.exit(code)
-}
-
-
-function generate(options) {
-  const createSdkGen = CreateSdkGen({
-    folder: options.folder,
-    rootpath
-  })
-
-
-  const model = resolveModel(options)
-    
-  const spec = {
-    // TODO: move to CreateSdkGen options
-    spec: options.spec,
-    model,
-    // root: Root,
-  }
-  
-  if(options.watch) {
-    spec.watch = [
-      '../tm',
-      '../feature',
-      '../def',
-      '../dist',
-    ]
-    createSdkGen.watch(spec)
-  }
-  else {
-    createSdkGen.generate(spec)
-  }
-
-}
-
-
-function resolveModel(options) {
-
-  const typespec = `
-name: string
-year: number
-def: filepath: string
-feature: &: {
-  active: *false | boolean
-}
-`
-
-  const features = options.feature.map(name=>`feature:${name}:active:true`)
-  
-  const src = [
-    typespec,
-    `name: ${options.name}`,
-    `year: ${new Date().getFullYear()}`,
-    `def: filepath: "${options.def || 'def.yml'}"`,
-    '' === options.model ? '' : `@"${options.model}"`,
-    ...(options.set||[]),
-    ...(features||[]),
-  ].join('\n')
-  const aopts = {}
-  const root = Aontu(src, aopts)
-  const hasErr = root.err && 0 < root.err.length
-
-  // TODO: collect all errors
-  if (hasErr) {
-    // console.log('ERROR ROOT', root.err)
-    throw root.err[0].msg
-  }
-
-  let genctx = new Context({ root })
-  const model = root.gen(genctx)
-
-  // TODO: collect all errors
-  if (genctx.err && 0 < genctx.err.length) {
-    // console.log(genctx.err)
-    // console.log('ERROR GEN', genctx.err)
-    throw new Error(JSON.stringify(genctx.err[0]))
-  }
-  
-  model.def.filename = Path.basename(model.def.filepath)
-
-  // console.log('MODEL')
-  // console.dir(model,{depth:null})
-  
-  return model
-}
-
-
-function resolveOptions() {
-
-  const args = parseArgs({
-    allowPositionals: true,
-    options: {
-      folder: {
-        type: 'string',
-        short: 'f',
-        default: '',
-      },
-      
-      def: {
-        type: 'string',
-        short: 'd',
-        default: '',
-      },
-      
-      set: {
-        type: 'string',
-        short: 's',
-        multiple: true,
-      },
-
-      model: {
-        type: 'string',
-        short: 'm',
-        default: '',
-      },
-      
-      feature: {
-        type: 'string',
-        short: 't',
-        multiple: true,
-      },
-      
-      watch: {
-        type: 'boolean',
-        short: 'w',
-      },
-      
-      debug: {
-        type: 'boolean',
-        short: 'g',
-      },
-      
-      help: {
-        type: 'boolean',
-        short: 'h',
-      },
-      
-      version: {
-        type: 'boolean',
-        short: 'v',
-      },
-      
-    }
-  })
-
-  const options = {
-    name: args.positionals[0],
-    folder: '' === args.values.folder ? args.positionals[0] : args.values.folder,
-    def: args.values.def,
-    model: args.values.model,
-    feature: args.values.feature,
-    set: args.values.set,
-    watch: !!args.values.watch,
-    debug: !!args.values.debug,
-    help: !!args.values.help,
-    version: !!args.values.version,
-  }
-
-  return options
-}
-
-
-function validateOptions(rawOptions) {
-  const optShape = Gubu({
-    name: Fault('The first argument should be the project name.', String),
-    folder: String,
-    def: '',
-    model: '',
-    feature: [String],
-    set: [String],
-    watch: Boolean,
-    debug: Boolean,
-    help: Boolean,
-    version: Boolean,
-  })
-
-  const err = []
-  const options = optShape(rawOptions,{err})
-
-  if(err[0]) {
-    throw new Error(err[0].text)
-  }
-
-  if('' !== options.def) {
-    options.def = Path.resolve(options.def)
-    const stat = statSync(options.def, {throwIfNoEntry:false})
-    if(null == stat) {
-      throw new Error('Definition file not found: '+options.def)
-    }
-  }
-
-  if('' !== options.model) {
-    options.model = Path.resolve(options.model)
-    const stat = statSync(options.model, {throwIfNoEntry:false})
-    if(null == stat) {
-      throw new Error('Model file not found: '+options.model)
-    }
-  }
-
-  return options
-}
-
-
-function handleError(err) {
-  CONSOLE.log('Voxgig SDK Generator Error:')
-
-  if(DEBUG) {
-    CONSOLE.log(err)
-  }
-  else {
-    CONSOLE.log(err.message)
-  }
-  
-  exit(err)
-}
-
-
-function version() {
-  CONSOLE.log(Pkg.version)
-}
-
-
-function help() {
-  let s = `
-Create a Voxgig SDK Generator project.
-
-Usage: npm create @voxgig/sdkgen@latest <name> <args> 
-
-  where <name> is the name of the SDK project. This is also used to
-    create a project folder if one is not explictly defined using the -f
-    argument. If run against an existing folder generated files will be
-    overwritten.
-
-  <args> are the command arguments:
-
-    --folder <folder>      Specific the folder for the SDK project. Optional.
-    -f <folder>              Default: <name> in current folder.
-
-    --def <file>           Specify the API definition file (OpenAPI, Swagger, etc)
-    -d                       that defines the SDK. Optional.
-
-    --model <file>         Specify the SDK model file to customize the SDK. Optional.
-    -m                       
-
-    --watch                Run in watch mode. The SDK project will be updated if any of the
-    -w                       project inputs (such as the spec file) change.
-
-    --debug                Print verbose logging.
-    -d                       
-
-    --help                 Print this help message.
-    -h
-
-    --version              Print version number.
-    -v
-
-
-Examples:
-
-# Basic usage
-> npm create @voxgig/sdkgen@latest foo
-# Creates the SDK Project in the folder ./foo
-
-
-# Custom project folder
-> npm create @voxgig/sdkgen@latest foo -f ~/Projects/Foo
-# Creates the SDK Project in the folder ~/Projects/Foo
-
-
-See also: https://voxgig.com/sdkgen
-`
-
-  CONSOLE.log(s)
-}