@voxgig/sdkgen 0.12.0 → 0.14.0

package/dist/cmp/Entity.js

@@ -5,8 +5,7 @@ const jostraca_1 = require("jostraca");
 const utility_1 = require("../utility");
 const Entity = (0, jostraca_1.cmp)(function Entity(props) {
     const { build, entity, ctx$ } = props;
-    // console.log('BUILD name', build.name)
-    const Entity_sdk = require((0, utility_1.resolvePath)(ctx$, `./${build.name}/Entity_${build.name}`));
+    const Entity_sdk = (0, utility_1.requirePath)(ctx$, `./${build.name}/Entity_${build.name}`);
     Entity_sdk['Entity']({ build, entity });
 });
 exports.Entity = Entity;

package/dist/cmp/Entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../../src/cmp/Entity.ts"],"names":[],"mappings":";;;AACA,uCAA8B;AAE9B,wCAAwC;AAGxC,MAAM,MAAM,GAAG,IAAA,cAAG,EAAC,SAAS,MAAM,CAAC,KAAU;IAC3C,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IAErC,wCAAwC;IACxC,MAAM,UAAU,GAAG,OAAO,CAAC,IAAA,qBAAW,EAAC,IAAI,EAAE,KAAK,KAAK,CAAC,IAAI,WAAW,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAErF,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;AACzC,CAAC,CAAC,CAAA;AAIA,wBAAM"}
+{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../../src/cmp/Entity.ts"],"names":[],"mappings":";;;AACA,uCAA8B;AAE9B,wCAAwC;AAGxC,MAAM,MAAM,GAAG,IAAA,cAAG,EAAC,SAAS,MAAM,CAAC,KAAU;IAC3C,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IAErC,MAAM,UAAU,GAAG,IAAA,qBAAW,EAAC,IAAI,EAAE,KAAK,KAAK,CAAC,IAAI,WAAW,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;IAC5E,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;AACzC,CAAC,CAAC,CAAA;AAIA,wBAAM"}

package/dist/cmp/ReadmeInstall.js

@@ -9,7 +9,7 @@ const ReadmeInstall = (0, jostraca_1.cmp)(function ReadmeInstall(props) {
 ## Install
 `);
     // Optional
-    const ReadmeInstall_sdk = (0, utility_1.requirePath)(ctx$, `./${build.name}/ReadmeInstall_${build.name}`);
+    const ReadmeInstall_sdk = (0, utility_1.requirePath)(ctx$, `./${build.name}/ReadmeInstall_${build.name}`, { ignore: true });
     if (ReadmeInstall_sdk) {
         ReadmeInstall_sdk['ReadmeInstall']({ build });
     }

package/dist/cmp/ReadmeInstall.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReadmeInstall.js","sourceRoot":"","sources":["../../src/cmp/ReadmeInstall.ts"],"names":[],"mappings":";;;AAEA,uCAAuC;AAEvC,wCAAwC;AAGxC,MAAM,aAAa,GAAG,IAAA,cAAG,EAAC,SAAS,aAAa,CAAC,KAAU;IACzD,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IAE7B,IAAA,kBAAO,EAAC;;CAET,CAAC,CAAA;IAEA,WAAW;IACX,MAAM,iBAAiB,GAAG,IAAA,qBAAW,EAAC,IAAI,EAAE,KAAK,KAAK,CAAC,IAAI,kBAAkB,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;IAE1F,IAAI,iBAAiB,EAAE,CAAC;QACtB,iBAAiB,CAAC,eAAe,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;IAC/C,CAAC;AACH,CAAC,CAAC,CAAA;AAOA,sCAAa"}
+{"version":3,"file":"ReadmeInstall.js","sourceRoot":"","sources":["../../src/cmp/ReadmeInstall.ts"],"names":[],"mappings":";;;AAEA,uCAAuC;AAEvC,wCAAwC;AAGxC,MAAM,aAAa,GAAG,IAAA,cAAG,EAAC,SAAS,aAAa,CAAC,KAAU;IACzD,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IAE7B,IAAA,kBAAO,EAAC;;CAET,CAAC,CAAA;IAEA,WAAW;IACX,MAAM,iBAAiB,GACrB,IAAA,qBAAW,EAAC,IAAI,EAAE,KAAK,KAAK,CAAC,IAAI,kBAAkB,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;IAEpF,IAAI,iBAAiB,EAAE,CAAC;QACtB,iBAAiB,CAAC,eAAe,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;IAC/C,CAAC;AACH,CAAC,CAAC,CAAA;AAOA,sCAAa"}

package/dist/cmp/ReadmeQuick.js

@@ -9,7 +9,7 @@ const ReadmeQuick = (0, jostraca_1.cmp)(function ReadmeQuick(props) {
 ## Quick Start
 
 `);
-    const ReadmeQuick_sdk = (0, utility_1.requirePath)(ctx$, `./${build.name}/ReadmeQuick_${build.name}`);
+    const ReadmeQuick_sdk = (0, utility_1.requirePath)(ctx$, `./${build.name}/ReadmeQuick_${build.name}`, { ignore: true });
     if (ReadmeQuick_sdk) {
         ReadmeQuick_sdk['ReadmeQuick']({ build });
     }

package/dist/cmp/ReadmeQuick.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReadmeQuick.js","sourceRoot":"","sources":["../../src/cmp/ReadmeQuick.ts"],"names":[],"mappings":";;;AACA,uCAAuC;AAEvC,wCAAwC;AAGxC,MAAM,WAAW,GAAG,IAAA,cAAG,EAAC,SAAS,WAAW,CAAC,KAAU;IACrD,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IAE7B,IAAA,kBAAO,EAAC;;;CAGT,CAAC,CAAA;IAGA,MAAM,eAAe,GAAG,IAAA,qBAAW,EAAC,IAAI,EAAE,KAAK,KAAK,CAAC,IAAI,gBAAgB,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;IAEtF,IAAI,eAAe,EAAE,CAAC;QACpB,eAAe,CAAC,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;IAC3C,CAAC;AACH,CAAC,CAAC,CAAA;AAMA,kCAAW"}
+{"version":3,"file":"ReadmeQuick.js","sourceRoot":"","sources":["../../src/cmp/ReadmeQuick.ts"],"names":[],"mappings":";;;AACA,uCAAuC;AAEvC,wCAAwC;AAGxC,MAAM,WAAW,GAAG,IAAA,cAAG,EAAC,SAAS,WAAW,CAAC,KAAU;IACrD,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IAE7B,IAAA,kBAAO,EAAC;;;CAGT,CAAC,CAAA;IAEA,MAAM,eAAe,GACnB,IAAA,qBAAW,EAAC,IAAI,EAAE,KAAK,KAAK,CAAC,IAAI,gBAAgB,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;IAElF,IAAI,eAAe,EAAE,CAAC;QACpB,eAAe,CAAC,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;IAC3C,CAAC;AACH,CAAC,CAAC,CAAA;AAMA,kCAAW"}

package/dist/sdkgen.d.ts

@@ -1,4 +1,5 @@
 import * as JostracaModule from 'jostraca';
+import { Pino } from '@voxgig/util';
 import { Main } from './cmp/Main';
 import { Entity } from './cmp/Entity';
 import { Feature } from './cmp/Feature';
@@ -18,13 +19,16 @@ type SdkGenOptions = {
     meta?: {
         name: string;
     };
+    debug?: boolean | string;
+    pino?: ReturnType<typeof Pino>;
 };
 declare const Jostraca: typeof JostracaModule.Jostraca;
 declare function SdkGen(opts: SdkGenOptions): {
+    pino: import("pino").Logger<string, boolean>;
     generate: (spec: any) => Promise<void>;
 };
 declare namespace SdkGen {
-    var makeBuild: (opts: SdkGenOptions) => Promise<(model: any, build: any) => Promise<void>>;
+    var makeBuild: (opts: SdkGenOptions) => Promise<(model: any, build: any, ctx: any) => Promise<void>>;
 }
 export type { SdkGenOptions, };
 type Component = (props: any, children?: any) => void;

package/dist/sdkgen.js

@@ -28,6 +28,9 @@ exports.Jostraca = exports.ReadmeEntity = exports.ReadmeOptions = exports.Readme
 exports.SdkGen = SdkGen;
 const Fs = __importStar(require("node:fs"));
 const JostracaModule = __importStar(require("jostraca"));
+// import Pino from 'pino'
+// import PinoPretty from 'pino-pretty'
+const util_1 = require("@voxgig/util");
 const apidef_1 = require("@voxgig/apidef");
 const Main_1 = require("./cmp/Main");
 Object.defineProperty(exports, "Main", { enumerable: true, get: function () { return Main_1.Main; } });
@@ -49,13 +52,18 @@ exports.Jostraca = Jostraca;
 function SdkGen(opts) {
     const fs = opts.fs || Fs;
     const folder = opts.folder || '.';
-    const def = opts.def || 'def.yml';
+    // const def = opts.def || 'def.yml'
     const jostraca = Jostraca();
+    const pino = (0, util_1.prettyPino)('sdkgen', opts);
+    const log = pino.child({ cmp: 'sdkgen' });
+    // console.log('SDKGEN OPTS', opts)
     async function generate(spec) {
+        const start = Date.now();
         const { model, config } = spec;
-        // console.log('SDKGEN.config', config)
+        log.info({ point: 'generate-start', start });
+        log.debug({ point: 'generate-spec', spec });
         let Root = spec.root;
-        if (null == Root) {
+        if (null == Root && null != config.root) {
             clear(config.root);
             const rootModule = require(config.root);
             Root = rootModule.Root;
@@ -65,43 +73,51 @@ function SdkGen(opts) {
           return
         }
         */
-        // console.log('OPTIONS', opts)
-        const opts = { fs, folder, meta: { spec } };
-        try {
-            await jostraca.generate(opts, () => Root({ model }));
-        }
-        catch (err) {
-            console.log('SDKGEN ERROR: ', err);
-            throw err;
-        }
+        const opts = { fs, folder, log: log.child({ cmp: 'jostraca' }), meta: { spec } };
+        await jostraca.generate(opts, () => Root({ model }));
+        log.info({ point: 'generate-end' });
     }
     async function prepare(spec, ctx) {
         return await (0, prepare_openapi_1.PrepareOpenAPI)(spec, ctx);
     }
     return {
+        pino,
         generate,
     };
 }
 SdkGen.makeBuild = async function (opts) {
-    // console.log('SdkGen.makeBuild', opts)
-    const sdkgen = SdkGen(opts);
-    const apidef = (0, apidef_1.ApiDef)();
+    let sdkgen = undefined;
     const config = {
         root: opts.root,
-        def: opts.def,
+        def: opts.def || 'no-def',
         kind: 'openapi-3',
-        model: opts.model ? (opts.model.folder + '/api.jsonic') : undefined,
+        model: opts.model ? (opts.model.folder + '/api.jsonic') : 'no-model',
         meta: opts.meta || {},
-        entity: opts.model ? opts.model.entity : undefined,
     };
-    await apidef.watch(config);
-    return async function build(model, build) {
-        // TODO: voxgig model needs to handle errors from here
-        return sdkgen.generate({ model, build, config });
+    return async function build(model, build, ctx) {
+        if (null == sdkgen) {
+            sdkgen = SdkGen({
+                ...opts,
+                pino: build.log,
+            });
+            const apidef = (0, apidef_1.ApiDef)({
+                pino: build.log,
+            });
+            if (true === ctx.watch) {
+                await apidef.watch(config);
+            }
+            else {
+                await apidef.generate(config);
+            }
+        }
+        await sdkgen.generate({ model, build, config });
     };
 };
 // Adapted from https://github.com/sindresorhus/import-fresh - Thanks!
 function clear(path) {
+    if (null == path) {
+        return;
+    }
     let filePath = require.resolve(path);
     if (require.cache[filePath]) {
         const children = require.cache[filePath].children.map(child => child.id);

package/dist/sdkgen.js.map

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

package/dist/utility.js

@@ -12,15 +12,17 @@ const resolvePath = (ctx$, path) => {
 exports.resolvePath = resolvePath;
 const requirePath = (ctx$, path, flags) => {
     const fullpath = resolvePath(ctx$, path);
-    const ignore = null == flags?.ignore ? true : flags.ignore;
+    const ignore = null == flags?.ignore ? false : flags.ignore;
     try {
         return require(fullpath);
     }
     catch (err) {
-        if (!ignore) {
+        if (ignore) {
+            ctx$.log.warn({ point: 'require-missing', path, note: path });
+        }
+        else {
             throw err;
         }
-        console.warn('MISSING: ', path);
     }
 };
 exports.requirePath = requirePath;

package/dist/utility.js.map

@@ -1 +1 @@
-{"version":3,"file":"utility.js","sourceRoot":"","sources":["../src/utility.ts"],"names":[],"mappings":";;;;;;AACA,0DAA4B;AAG5B,MAAM,WAAW,GAAG,CAAC,IAAS,EAAE,IAAY,EAAO,EAAE;IACnD,MAAM,QAAQ,GAAG,mBAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAC3D,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAqBC,kCAAW;AAlBb,MAAM,WAAW,GAAG,CAAC,IAAS,EAAE,IAAY,EAAE,KAA4B,EAAO,EAAE;IACjF,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IACxC,MAAM,MAAM,GAAG,IAAI,IAAI,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAA;IAE1D,IAAI,CAAC;QACH,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC1B,CAAC;IACD,OAAO,GAAQ,EAAE,CAAC;QAChB,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,GAAG,CAAA;QACX,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;IACjC,CAAC;AACH,CAAC,CAAA;AAMC,kCAAW"}
+{"version":3,"file":"utility.js","sourceRoot":"","sources":["../src/utility.ts"],"names":[],"mappings":";;;;;;AACA,0DAA4B;AAG5B,MAAM,WAAW,GAAG,CAAC,IAAS,EAAE,IAAY,EAAO,EAAE;IACnD,MAAM,QAAQ,GAAG,mBAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAC3D,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAuBC,kCAAW;AApBb,MAAM,WAAW,GAAG,CAAC,IAAS,EAAE,IAAY,EAAE,KAA4B,EAAO,EAAE;IACjF,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IACxC,MAAM,MAAM,GAAG,IAAI,IAAI,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAA;IAE3D,IAAI,CAAC;QACH,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAA;IAC1B,CAAC;IACD,OAAO,GAAQ,EAAE,CAAC;QAChB,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;QAC/D,CAAC;aACI,CAAC;YACJ,MAAM,GAAG,CAAA;QACX,CAAC;IACH,CAAC;AACH,CAAC,CAAA;AAMC,kCAAW"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/sdkgen",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "main": "dist/sdkgen.js",
   "type": "commonjs",
   "types": "dist/sdkgen.d.ts",
@@ -37,16 +37,19 @@
   "devDependencies": {
     "@hapi/code": "^9.0.3",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "22.7.5",
-    "aontu": "^0.22.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.6",
-    "@voxgig/apidef": "^0.1.4",
-    "jostraca": "^0.7.6"
+    "@redocly/openapi-core": "^1.25.11",
+    "@voxgig/apidef": "^1.1.1",
+    "@voxgig/util": "^0.0.6",
+    "jostraca": "^0.8.1",
+    "pino": "^9.5.0",
+    "pino-pretty": "^13.0.0"
   }
 }

package/src/cmp/Entity.ts

@@ -1,15 +1,13 @@
 
 import { cmp } from 'jostraca'
 
-import { resolvePath } from '../utility'
+import { requirePath } from '../utility'
 
 
 const Entity = cmp(function Entity(props: any) {
   const { build, entity, ctx$ } = props
 
-  // console.log('BUILD name', build.name)
-  const Entity_sdk = require(resolvePath(ctx$, `./${build.name}/Entity_${build.name}`))
-
+  const Entity_sdk = requirePath(ctx$, `./${build.name}/Entity_${build.name}`)
   Entity_sdk['Entity']({ build, entity })
 })
 

package/src/cmp/ReadmeInstall.ts

@@ -13,7 +13,8 @@ const ReadmeInstall = cmp(function ReadmeInstall(props: any) {
 `)
 
   // Optional
-  const ReadmeInstall_sdk = requirePath(ctx$, `./${build.name}/ReadmeInstall_${build.name}`)
+  const ReadmeInstall_sdk =
+    requirePath(ctx$, `./${build.name}/ReadmeInstall_${build.name}`, { ignore: true })
 
   if (ReadmeInstall_sdk) {
     ReadmeInstall_sdk['ReadmeInstall']({ build })

package/src/cmp/ReadmeQuick.ts

@@ -12,8 +12,8 @@ const ReadmeQuick = cmp(function ReadmeQuick(props: any) {
 
 `)
 
-
-  const ReadmeQuick_sdk = requirePath(ctx$, `./${build.name}/ReadmeQuick_${build.name}`)
+  const ReadmeQuick_sdk =
+    requirePath(ctx$, `./${build.name}/ReadmeQuick_${build.name}`, { ignore: true })
 
   if (ReadmeQuick_sdk) {
     ReadmeQuick_sdk['ReadmeQuick']({ build })

package/src/sdkgen.ts

@@ -5,6 +5,11 @@ import * as Fs from 'node:fs'
 
 import * as JostracaModule from 'jostraca'
 
+// import Pino from 'pino'
+// import PinoPretty from 'pino-pretty'
+
+import { prettyPino, Pino } from '@voxgig/util'
+
 import { ApiDef } from '@voxgig/apidef'
 
 
@@ -31,6 +36,8 @@ type SdkGenOptions = {
   meta?: {
     name: string
   }
+  debug?: boolean | string
+  pino?: ReturnType<typeof Pino>
 }
 
 
@@ -40,21 +47,28 @@ const { Jostraca } = JostracaModule
 function SdkGen(opts: SdkGenOptions) {
   const fs = opts.fs || Fs
   const folder = opts.folder || '.'
-  const def = opts.def || 'def.yml'
+  // const def = opts.def || 'def.yml'
   const jostraca = Jostraca()
 
+  const pino = prettyPino('sdkgen', opts)
+
+  const log = pino.child({ cmp: 'sdkgen' })
+
+  // console.log('SDKGEN OPTS', opts)
+
 
   async function generate(spec: any) {
+    const start = Date.now()
     const { model, config } = spec
 
-
-    // console.log('SDKGEN.config', config)
+    log.info({ point: 'generate-start', start })
+    log.debug({ point: 'generate-spec', spec })
 
     let Root = spec.root
 
-    if (null == Root) {
+    if (null == Root && null != config.root) {
       clear(config.root)
-      const rootModule = require(config.root)
+      const rootModule: any = require(config.root)
       Root = rootModule.Root
     }
 
@@ -64,17 +78,11 @@ function SdkGen(opts: SdkGenOptions) {
     }
     */
 
-    // console.log('OPTIONS', opts)
+    const opts = { fs, folder, log: log.child({ cmp: 'jostraca' }), meta: { spec } }
 
-    const opts = { fs, folder, meta: { spec } }
+    await jostraca.generate(opts, () => Root({ model }))
 
-    try {
-      await jostraca.generate(opts, () => Root({ model }))
-    }
-    catch (err: any) {
-      console.log('SDKGEN ERROR: ', err)
-      throw err
-    }
+    log.info({ point: 'generate-end' })
   }
 
 
@@ -84,6 +92,7 @@ function SdkGen(opts: SdkGenOptions) {
 
 
   return {
+    pino,
     generate,
   }
 
@@ -91,26 +100,36 @@ function SdkGen(opts: SdkGenOptions) {
 
 
 SdkGen.makeBuild = async function(opts: SdkGenOptions) {
-  // console.log('SdkGen.makeBuild', opts)
-
-  const sdkgen = SdkGen(opts)
-
-  const apidef = ApiDef()
+  let sdkgen: any = undefined
 
   const config = {
     root: opts.root,
-    def: opts.def,
+    def: opts.def || 'no-def',
     kind: 'openapi-3',
-    model: opts.model ? (opts.model.folder + '/api.jsonic') : undefined,
+    model: opts.model ? (opts.model.folder + '/api.jsonic') : 'no-model',
     meta: opts.meta || {},
-    entity: opts.model ? opts.model.entity : undefined,
   }
 
-  await apidef.watch(config)
+  return async function build(model: any, build: any, ctx: any) {
+    if (null == sdkgen) {
+      sdkgen = SdkGen({
+        ...opts,
+        pino: build.log,
+      })
+
+      const apidef = ApiDef({
+        pino: build.log,
+      })
+
+      if (true === ctx.watch) {
+        await apidef.watch(config)
+      }
+      else {
+        await apidef.generate(config)
+      }
+    }
 
-  return async function build(model: any, build: any) {
-    // TODO: voxgig model needs to handle errors from here
-    return sdkgen.generate({ model, build, config })
+    await sdkgen.generate({ model, build, config })
   }
 }
 
@@ -118,6 +137,10 @@ SdkGen.makeBuild = async function(opts: SdkGenOptions) {
 
 // Adapted from https://github.com/sindresorhus/import-fresh - Thanks!
 function clear(path: string) {
+  if (null == path) {
+    return
+  }
+
   let filePath = require.resolve(path)
 
   if (require.cache[filePath]) {

package/src/utility.ts

@@ -10,16 +10,18 @@ const resolvePath = (ctx$: any, path: string): any => {
 
 const requirePath = (ctx$: any, path: string, flags?: { ignore?: boolean }): any => {
   const fullpath = resolvePath(ctx$, path)
-  const ignore = null == flags?.ignore ? true : flags.ignore
+  const ignore = null == flags?.ignore ? false : flags.ignore
 
   try {
     return require(fullpath)
   }
   catch (err: any) {
-    if (!ignore) {
+    if (ignore) {
+      ctx$.log.warn({ point: 'require-missing', path, note: path })
+    }
+    else {
       throw err
     }
-    console.warn('MISSING: ', path)
   }
 }