@voxgig/sdkgen 0.25.0 → 0.28.0

package/project/.sdk/src/cmp/go/utility_go.ts

@@ -0,0 +1,88 @@
+
+import * as Path from 'node:path'
+
+
+import {
+  clone,
+  walk,
+} from '@voxgig/struct'
+
+
+function projectPath(suffix?: string): string {
+  return Path.normalize(Path.join(__dirname, '../../..', suffix ?? ''))
+}
+
+
+function formatGoMap(obj: any, indent: number = 0): string {
+  if (obj == null) {
+    return 'nil'
+  }
+
+  const pad = '\t'.repeat(indent)
+  const padInner = '\t'.repeat(indent + 1)
+
+  if (Array.isArray(obj)) {
+    if (obj.length === 0) {
+      return '[]any{}'
+    }
+    const items = obj.map(v => padInner + formatGoValue(v, indent + 1)).join(',\n')
+    return `[]any{\n${items},\n${pad}}`
+  }
+
+  if (typeof obj === 'object') {
+    const entries = Object.entries(obj)
+    if (entries.length === 0) {
+      return 'map[string]any{}'
+    }
+    const items = entries
+      .map(([k, v]) => `${padInner}"${k}": ${formatGoValue(v, indent + 1)}`)
+      .join(',\n')
+    return `map[string]any{\n${items},\n${pad}}`
+  }
+
+  return formatGoValue(obj, indent)
+}
+
+
+function formatGoValue(val: any, indent: number = 0): string {
+  if (val === null || val === undefined) {
+    return 'nil'
+  }
+  if (typeof val === 'string') {
+    return `"${val.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`
+  }
+  if (typeof val === 'number') {
+    if (Number.isInteger(val)) {
+      return String(val)
+    }
+    return String(val)
+  }
+  if (typeof val === 'boolean') {
+    return val ? 'true' : 'false'
+  }
+  if (Array.isArray(val)) {
+    return formatGoMap(val, indent)
+  }
+  if (typeof val === 'object') {
+    return formatGoMap(val, indent)
+  }
+  return String(val)
+}
+
+
+function clean(o: any) {
+  return walk(clone(o), (k: any, v: any, p: any) => {
+    if (null != k && k.endsWith('$')) {
+      delete p[k]
+    }
+    return v
+  })
+}
+
+
+export {
+  clean,
+  formatGoMap,
+  formatGoValue,
+  projectPath,
+}

package/project/.sdk/src/cmp/js/Main_js.ts

@@ -17,8 +17,8 @@ const Main = cmp(async function Main(props: any) {
   const { target } = props
   const { model } = props.ctx$
 
-  const { entity } = model.main.api
-  const { feature } = model.main.sdk
+  const { entity } = model.main.kit
+  const { feature } = model.main.kit
 
   Package({ target })
 
@@ -72,7 +72,7 @@ const Main = cmp(async function Main(props: any) {
       }, () => {
         each(entity, (entity: any) => {
           // console.log('ENTITY', entity.name)
-          MainEntity({ target, entity, entitySDK: model.main.sdk.entity[entity.name] })
+          MainEntity({ target, entity, entitySDK: model.main.kit.entity[entity.name] })
         })
       })
     })

package/project/.sdk/src/cmp/js/Quick_js.ts

@@ -21,7 +21,7 @@ const Quick = cmp(function Quick(props: any) {
 
   // TODO: selected features should be active by default!
 
-  const featureOptions = each(model.main.sdk.feature)
+  const featureOptions = each(model.main.kit.feature)
     .filter((f: any) => f.active)
     .reduce((a: any, f: any) => a + `\n    ${f.name}: { active: true },`, '')
 

package/project/.sdk/src/cmp/js/fragment/EntityCreateOp.fragment.js

@@ -4,7 +4,7 @@ async create(data) {
   let entity = this
   let client = this.#client
   const utility = this.#utility
-  const { operator, spec, request, response, result, error, struct, done } = utility
+  const { operator, makeSpec, makeRequest, makeResponse, makeResult, error, struct, done } = utility
   
   let op = {
     entity: 'Name',
@@ -22,7 +22,7 @@ async create(data) {
   let ctx = { client, op, utility, entity }
 
   
-  // #PreOperation-Hook    
+  // #PreTarget-Hook    
 
   await operator(ctx)
 
@@ -31,22 +31,22 @@ async create(data) {
 
   this.#data = ctx.op.data
   
-  await spec(ctx)
+  await makeSpec(ctx)
 
   
   // #PreRequest-Hook
 
-  await request(ctx)
+  await makeRequest(ctx)
 
   
   // #PreResponse-Hook
 
-  await response(ctx)
+  await makeResponse(ctx)
 
   
   // #PreResult-Hook
 
-  await result(ctx)
+  await makeResult(ctx)
 
 
   // #PostOperation-Hook

package/project/.sdk/src/cmp/js/fragment/EntityListOp.fragment.js

@@ -4,7 +4,7 @@ async list(match) {
   let entity = this
   let client = this.#client
   const utility = this.#utility
-    const { operator, spec, request, response, result, error, struct, done } = utility
+    const { operator, makeSpec, makeRequest, makeResponse, makeResult, error, struct, done } = utility
   
   let op = {
     entity: 'Name',
@@ -22,7 +22,7 @@ async list(match) {
   let ctx = { client, entity, op, utility}
 
   
-  // #PreOperation-Hook    
+  // #PreTarget-Hook    
 
   await operator(ctx)
 
@@ -31,22 +31,22 @@ async list(match) {
 
   this.#match = ctx.op.match
   
-  await spec(ctx)
+  await makeSpec(ctx)
 
   
   // #PreRequest-Hook
 
-  await request(ctx)
+  await makeRequest(ctx)
 
   
   // #PreResponse-Hook
 
-  await response(ctx)
+  await makeResponse(ctx)
 
   
   // #PreResult-Hook
 
-  await result(ctx)
+  await makeResult(ctx)
 
 
   // #PostOperation-Hook

package/project/.sdk/src/cmp/js/fragment/EntityLoadOp.fragment.js

@@ -4,7 +4,7 @@ async load(match) {
   const entity = this
   const client = this.#client
   const utility = this.#utility
-  const { operator, spec, request, response, result, error, struct, done } = utility
+  const { operator, makeSpec, makeRequest, makeResponse, makeResult, error, struct, done } = utility
   
   const op = {
     entity: 'Name',
@@ -22,7 +22,7 @@ async load(match) {
   let ctx = { client, entity, op, utility}
 
   
-  // #PreOperation-Hook    
+  // #PreTarget-Hook    
 
   await operator(ctx)
 
@@ -31,22 +31,22 @@ async load(match) {
 
   this.#match = op.match
   
-  await spec(ctx)
+  await makeSpec(ctx)
 
   
   // #PreRequest-Hook
 
-  await request(ctx)
+  await makeRequest(ctx)
 
   
   // #PreResponse-Hook
 
-  await response(ctx)
+  await makeResponse(ctx)
 
   
   // #PreResult-Hook
   
-  await result(ctx)
+  await makeResult(ctx)
 
   
   // #PostOperation-Hook

package/project/.sdk/src/cmp/js/fragment/EntityRemoveOp.fragment.js

@@ -4,7 +4,7 @@ async remove(match) {
   let entity = this
   let client = this.#client
   const utility = this.#utility
-  const { operator, spec, request, response, result, error, struct, done } = utility
+  const { operator, makeSpec, makeRequest, makeResponse, makeResult, error, struct, done } = utility
   
   let op = {
     entity: 'Name',
@@ -22,7 +22,7 @@ async remove(match) {
   let ctx = {client, entity, op, utility}
 
 
-  // #PreOperation-Hook    
+  // #PreTarget-Hook    
 
   await operator(ctx)
 
@@ -31,22 +31,22 @@ async remove(match) {
 
   this.#data = op.data
   
-  await spec(ctx)
+  await makeSpec(ctx)
 
   
   // #PreRequest-Hook
 
-  await request(ctx)
+  await makeRequest(ctx)
 
   
   // #PreResponse-Hook
 
-  await response(ctx)
+  await makeResponse(ctx)
 
   
   // #PreResult-Hook
 
-  await result(ctx)
+  await makeResult(ctx)
 
 
   // #PostOperation-Hook

package/project/.sdk/src/cmp/js/fragment/EntityUpdateOp.fragment.js

@@ -4,7 +4,7 @@ async update(data) {
   let entity = this
   let client = this.#client
   const utility = this.#utility
-  const { operator, spec, request, response, result, error, struct, done } = utility
+  const { operator, makeSpec, makeRequest, makeResponse, makeResult, error, struct, done } = utility
   
   let op = {
     entity: 'Name',
@@ -22,7 +22,7 @@ async update(data) {
   let ctx = {client, entity, op, utility}
 
 
-  // #PreOperation-Hook    
+  // #PreTarget-Hook    
 
   await operator(ctx)
 
@@ -31,22 +31,22 @@ async update(data) {
 
   this.#data = op.data
   
-  await spec(ctx)
+  await makeSpec(ctx)
 
   
   // #PreRequest-Hook
 
-  await request(ctx)
+  await makeRequest(ctx)
 
   
   // #PreResponse-Hook
 
-  await response(ctx)
+  await makeResponse(ctx)
 
   
   // #PreResult-Hook
 
-  await result(ctx)
+  await makeResult(ctx)
 
 
   // #PostOperation-Hook

package/project/.sdk/src/cmp/js/fragment/Main.fragment.js

@@ -10,7 +10,7 @@ class NameSDK {
   
   constructor(options) {
 
-    this.#options = this.#utility.options({
+    this.#options = this.#utility.makeOptions({
       client: this,
       utility: this.#utility,
       config: Config,
@@ -55,6 +55,90 @@ class NameSDK {
   }
 
   
+  async prepare(fetchargs) {
+    const utility = this.#utility
+    const { headers, auth, fullurl } = utility
+
+    fetchargs = fetchargs || {}
+
+    const options = this.options()
+
+    const spec = {
+      base: options.base,
+      prefix: options.prefix,
+      suffix: options.suffix,
+      path: fetchargs.path || '',
+      method: fetchargs.method || 'GET',
+      params: fetchargs.params || {},
+      query: fetchargs.query || {},
+      headers: headers({ client: this, utility }),
+      body: fetchargs.body,
+      step: 'start',
+      alias: {},
+    }
+
+    // Merge user-provided headers over SDK defaults.
+    if (fetchargs.headers) {
+      const uheaders = fetchargs.headers
+      for (let key in uheaders) {
+        spec.headers[key] = uheaders[key]
+      }
+    }
+
+    // Apply SDK auth.
+    const ctx = { client: this, op: { params: [] }, spec, utility }
+    auth(ctx)
+
+    // Build URL.
+    const url = fullurl(ctx)
+
+    const fetchdef = {
+      url,
+      method: spec.method,
+      headers: { ...spec.headers },
+    }
+
+    if (null != spec.body) {
+      fetchdef.body =
+        'object' === typeof spec.body ? JSON.stringify(spec.body) : spec.body
+    }
+
+    return fetchdef
+  }
+
+
+  async direct(fetchargs) {
+    const fetchdef = await this.prepare(fetchargs)
+    if (fetchdef instanceof Error) {
+      return fetchdef
+    }
+
+    const options = this.options()
+    const fetch = options.system.fetch
+
+    try {
+      const response = await fetch(fetchdef.url, fetchdef)
+
+      if (null == response) {
+        return { ok: false, err: new Error('response: undefined') }
+      }
+
+      const status = response.status
+      const json = 'function' === typeof response.json ? await response.json() : response.json
+
+      return {
+        ok: status >= 200 && status < 300,
+        status,
+        headers: response.headers,
+        data: json,
+      }
+    }
+    catch (err) {
+      return { ok: false, err }
+    }
+  }
+
+
   // <[SLOT]>
 }
 

package/project/.sdk/src/cmp/ts/Config_ts.ts

@@ -1,21 +1,44 @@
 
 import * as Path from 'node:path'
 
+
 import {
-  cmp, each, indent,
-  File, Content, Fragment
+  Content,
+  File,
+  Fragment,
+  Line,
+  cmp,
+  each,
+  indent,
 } from '@voxgig/sdkgen'
 
 
+import {
+  KIT,
+  Model,
+  getModelPath,
+  nom,
+} from '@voxgig/apidef'
+
+
+import {
+  clean,
+  formatJson,
+} from './utility_ts'
 
 
 const Config = cmp(async function Config(props: any) {
-  const { target, ctx$: { model } } = props
-  const { main: { sdk: { entity } } } = model
+  const ctx$ = props.ctx$
+  const target = props.target
+
+  const model: Model = ctx$.model
+
+  const entity = getModelPath(model, `main.${KIT}.entity`)
+  const feature = getModelPath(model, `main.${KIT}.feature`)
 
   const ff = Path.normalize(__dirname + '/../../../src/cmp/ts/fragment/')
 
-  const headers = model?.main?.sdk?.config?.headers || {}
+  const headers = getModelPath(model, `main.${KIT}.config.headers`) || {}
 
   File({ name: 'Config.' + target.ext }, () => {
 
@@ -23,13 +46,37 @@ const Config = cmp(async function Config(props: any) {
       from: ff + 'Config.fragment.ts',
 
       replace: {
+
         "'HEADERS'": indent(JSON.stringify(headers, null, 2), 4).trim(),
+
+        '// #ImportFeatures': () => each(feature, (f: any) => {
+          Line(`import { ${nom(f, 'Name')}Feature } from ` +
+            `'./feature/${f.name}/${nom(f, 'Name')}Feature'`)
+        }),
+
+        '// #FeatureClasses': () => each(feature, (f: any) => {
+          Line(` ${f.name}: ${nom(f, 'Name')}Feature`)
+        }),
+
+        '// #FeatureConfigs': () => each(feature, (f: any) => {
+          Line(` ${f.name}: ${formatJson(f.config, { margin: 4 })}`)
+        }),
+
+
         '// #EntityConfigs': () => each(entity, (entity: any) => {
           Content(`
       ${entity.name}: {
       },
 `)
-        })
+        }),
+
+        "'ENTITYMAP'": formatJson(Object.values(entity)
+          .reduce((a: any, n: any) => (a[n.name] = clean({
+            fields: n.fields,
+            name: n.name,
+            op: n.op,
+            relations: n.relations,
+          }), a), {}), { margin: 2 }).trim(),
       }
     })
   })

package/project/.sdk/src/cmp/ts/EntityOperation_ts.ts

@@ -7,7 +7,7 @@ import {
 
 import { jsonify } from '@voxgig/struct'
 
-import { formatJSONSrc } from './utility_ts'
+import { formatJSONSrc, formatJson } from './utility_ts'
 
 
 const EntityOperation = cmp(function Operation(props: any) {
@@ -22,17 +22,6 @@ const EntityOperation = cmp(function Operation(props: any) {
   }
 
   const entop = entity.op[opname]
-  const path = entop.path
-
-  // // TODO: move up to to common Entity
-  // const params = JSON.stringify((path.match(/\{[^}]+\}/g) || [])
-  //   .map((p: string) => p.substring(1, p.length - 1))
-  //   .filter((p: string) => null != p && '' !== p))
-
-  // const aliasmap = JSON.stringify(entitySDK.alias.field)
-  const aliasmap = JSON.stringify(entity.alias.field)
-
-  // const hasp = '' != entop.place
 
   Fragment({
     from: ff + '/Entity' + camelify(opname) + 'Op.fragment.ts',
@@ -43,17 +32,10 @@ const EntityOperation = cmp(function Operation(props: any) {
       SdkName: model.const.Name,
       EntityName: entity.Name,
       entityname: entity.name,
-      PATH: entop.path,
-      "['PATHALT']": entop.pathalt,
-      "['PARAM-LIST']": jsonify(Object.keys(entop.param)),
-      "{ 'ALIAS': 'MAP' }": aliasmap,
-      "'REQFORM'": formatJSONSrc(JSON.stringify(entop.reqform)),
-      "'RESFORM'": formatJSONSrc(JSON.stringify(entop.resform)),
-      "'VALIDATE'": formatJSONSrc(JSON.stringify(entop.validate)),
-
+      "['TARGETS']": formatJson(entop.targets, { margin: 6 }).trim(),
       '#Feature-Hook': ({ name, indent }: any) =>
         Content({ indent }, `
-fres = featurehook(ctx, '${name}')
+fres = featureHook(ctx, '${name}')
 if (fres instanceof Promise) { await fres }
 `)
 

package/project/.sdk/src/cmp/ts/Entity_ts.ts

@@ -7,7 +7,7 @@ import {
 } from '@voxgig/sdkgen'
 
 import { EntityOperation } from './EntityOperation_ts'
-import { EntityTest } from './EntityTest_ts'
+// import { EntityTest } from './EntityTest_ts'
 
 
 const Entity = cmp(function Entity(props: any) {
@@ -19,7 +19,6 @@ const Entity = cmp(function Entity(props: any) {
   }
 
   names(entrep, entity.Name, 'EntityName')
-  // console.log('ENTREP', entrep)
 
   const ff = Path.normalize(__dirname + '/../../../src/cmp/ts/fragment/')
 
@@ -46,7 +45,7 @@ const Entity = cmp(function Entity(props: any) {
 
           '#Feature-Hook': ({ name, indent }: any) =>
             Content({ indent }, `
-fres = featurehook(ctx, '${name}')
+fres = featureHook(ctx, '${name}')
 if (fres instanceof Promise) { await fres }
 `.trim()),
 
@@ -57,8 +56,7 @@ if (fres instanceof Promise) { await fres }
     })
   })
 
-
-  EntityTest({ target, entity, entrep, ff })
+  // EntityTest({ target, entity, entrep, ff })
 })
 
 

package/project/.sdk/src/cmp/ts/Main_ts.ts

@@ -7,33 +7,42 @@ import {
 } from '@voxgig/sdkgen'
 
 
+import type {
+  ModelEntity
+} from '@voxgig/apidef'
+
+
+import {
+  KIT,
+  getModelPath
+} from '@voxgig/apidef'
+
+
 import { Package } from './Package_ts'
 import { Config } from './Config_ts'
 import { MainEntity } from './MainEntity_ts'
-import { Test } from './Test_ts'
+import { SdkError } from './SdkError_ts'
 
 
 const Main = cmp(async function Main(props: any) {
+
+  // Needs type: target object
   const { target } = props
   const { model } = props.ctx$
 
-  const { entity } = model.main.api
-  const { feature } = model.main.sdk
+  const entity: ModelEntity = getModelPath(model, `main.${KIT}.entity`)
+  const feature = getModelPath(model, `main.${KIT}.feature`)
 
   Package({ target })
 
-  Test({ target })
-
   Folder({ name: 'src' }, () => {
 
+    SdkError({ target })
+
     File({ name: model.const.Name + 'SDK.' + target.name }, () => {
 
       Line(`// ${model.const.Name} ${target.Name} SDK\n`)
 
-      List({ item: feature }, ({ item }: any) =>
-        Line(`import { ${item.Name + 'Feature'} } ` +
-          `from './feature/${item.name}/${item.Name}Feature'`))
-
       List({ item: entity }, ({ item }: any) =>
         Line(`import { ${item.Name}Entity } from './entity/${item.Name}Entity'`))
 
@@ -46,11 +55,11 @@ const Main = cmp(async function Main(props: any) {
             '#BuildFeatures': ({ indent }: any) => {
               List({ item: feature, line: false }, ({ item }: any) =>
                 Line({ indent },
-                  `addfeature(ctx, new ${item.Name}Feature())`))
+                  `featureAdd(this._rootctx, new ${item.Name}Feature())`))
             },
 
             '#Feature-Hook': ({ name, indent }: any) => Content({ indent }, `
-fres = featurehook(ctx, '${name}')
+fres = featureHook(ctx, '${name}')
 if (fres instanceof Promise) { await fres }
 `),
 
@@ -69,8 +78,9 @@ if (fres instanceof Promise) { await fres }
 
         // Entities
         () => {
-          each(entity, (entity: any) => {
-            const entprops = { target, entity, entitySDK: model.main.api.entity[entity.name] }
+          each(entity, (entity: ModelEntity) => {
+            const entitySDK = getModelPath(model, `main.${KIT}.entity.${entity.name}`)
+            const entprops = { target, entity, entitySDK }
             MainEntity(entprops)
           })
         })