@voxgig/sdkgen 0.26.1 → 0.28.0

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

@@ -21,7 +21,7 @@ import {
 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) {
@@ -35,10 +35,10 @@ const Main = cmp(async function Main(props: any) {
 
   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`)
@@ -55,7 +55,7 @@ const Main = cmp(async function Main(props: any) {
             '#BuildFeatures': ({ indent }: any) => {
               List({ item: feature, line: false }, ({ item }: any) =>
                 Line({ indent },
-                  `addfeature(this._rootctx, new ${item.Name}Feature())`))
+                  `featureAdd(this._rootctx, new ${item.Name}Feature())`))
             },
 
             '#Feature-Hook': ({ name, indent }: any) => Content({ indent }, `

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

@@ -0,0 +1,42 @@
+
+import * as Path from 'node:path'
+
+
+import {
+  File,
+  Fragment,
+  cmp,
+} from '@voxgig/sdkgen'
+
+
+import {
+  Model,
+} from '@voxgig/apidef'
+
+
+
+
+const SdkError = cmp(async function SdkError(props: any) {
+  const ctx$ = props.ctx$
+  const target = props.target
+
+  const model: Model = ctx$.model
+
+  const ff = Path.normalize(__dirname + '/../../../src/cmp/ts/fragment/')
+
+  File({ name: model.const.Name + 'Error.' + target.ext }, () => {
+
+    Fragment({
+      from: ff + 'SdkError.fragment.ts',
+
+      replace: {
+        ...ctx$.stdrep,
+      }
+    })
+  })
+})
+
+
+export {
+  SdkError
+}

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

@@ -0,0 +1,288 @@
+
+import {
+  nom,
+} from '@voxgig/apidef'
+
+
+import {
+  Content,
+  File,
+  Folder,
+  Fragment,
+  Slot,
+  cmp,
+} from '@voxgig/sdkgen'
+
+
+import {
+  projectPath
+} from './utility_ts'
+
+
+const TestDirect = cmp(function TestDirect(props: any) {
+  const ctx$ = props.ctx$
+  const model = ctx$.model
+  const stdrep = ctx$.stdrep
+
+  const target = props.target
+  const entity = props.entity
+
+  const ff = projectPath('src/cmp/ts/fragment/')
+
+  const PROJECTNAME = model.Name.toUpperCase()
+  const entidEnvVar = `${PROJECTNAME}_TEST_${entity.Name.toUpperCase()}_ENTID`
+
+  const opnames = Object.keys(entity.op)
+  const hasLoad = opnames.includes('load')
+  const hasList = opnames.includes('list')
+
+  if (!hasLoad && !hasList) {
+    return
+  }
+
+  Folder({ name: entity.name }, () => {
+
+    File({ name: nom(entity, 'Name') + 'Direct.test.' + target.name }, () => {
+
+      Fragment({
+        from: ff + 'Direct.test.fragment.ts',
+        replace: {
+          SdkName: nom(model.const, 'Name'),
+          EntityName: nom(entity, 'Name'),
+          entityname: entity.name,
+          ...stdrep,
+        }
+      }, () => {
+
+
+        Slot({ name: 'directSetup' }, () => {
+          Content(`
+function directSetup(mockres?: any) {
+  const calls: any[] = []
+
+  const env = envOverride({
+    '${entidEnvVar}': {},
+    '${PROJECTNAME}_TEST_LIVE': 'FALSE',
+    '${PROJECTNAME}_APIKEY': 'NONE',
+  })
+
+  const live = 'TRUE' === env.${PROJECTNAME}_TEST_LIVE
+
+  if (live) {
+    const client = new ${nom(model.const, 'Name')}SDK({
+      apikey: env.${PROJECTNAME}_APIKEY,
+    })
+
+    let idmap: any = env['${entidEnvVar}']
+    if ('string' === typeof idmap && idmap.startsWith('{')) {
+      idmap = JSON.parse(idmap)
+    }
+
+    return { client, calls, live, idmap }
+  }
+
+  const mockFetch = async (url: string, init: any) => {
+    calls.push({ url, init })
+    return {
+      status: 200,
+      statusText: 'OK',
+      headers: {},
+      json: async () => (null != mockres ? mockres : { id: 'direct01' }),
+    }
+  }
+
+  const client = new ${nom(model.const, 'Name')}SDK({
+    base: 'http://localhost:8080',
+    system: { fetch: mockFetch },
+  })
+
+  return { client, calls, live, idmap: {} as any }
+}
+  `)
+        })
+
+
+        Slot({ name: 'direct' }, () => {
+
+          if (hasLoad) {
+            generateDirectLoad(model, entity)
+          }
+
+          if (hasList) {
+            generateDirectList(model, entity)
+          }
+        })
+
+      })
+    })
+  })
+})
+
+
+function generateDirectLoad(model: any, entity: any) {
+  const loadOp = entity.op.load
+  const loadTarget = loadOp.targets[0]
+
+  if (null == loadTarget) {
+    return
+  }
+
+  const loadPath = (loadTarget.parts || []).join('/')
+  const loadParams = loadTarget.args?.params || []
+
+  // Get list info for live mode bootstrapping
+  const listOp = entity.op.list
+  const listTarget = listOp?.targets?.[0]
+  const listPath = listTarget ? (listTarget.parts || []).join('/') : ''
+  const listParams = listTarget?.args?.params || []
+  const hasList = null != listTarget
+
+  // Ancestor params (not 'id') for live mode
+  const ancestorParams = loadParams.filter((p: any) => p.name !== 'id')
+
+  const paramAsserts = loadParams.map((p: any, i: number) =>
+    '      assert(calls[0].url.includes(\'direct0' + (i + 1) + '\'))\n').join('')
+
+  // Build live list params
+  const liveListParams = listParams.map((p: any) => {
+    const key = p.name === 'id'
+      ? entity.name + '01'
+      : p.name.replace(/_id$/, '') + '01'
+    return { name: p.name, key }
+  })
+
+  // Build live ancestor params for load
+  const liveAncestorParams = ancestorParams.map((p: any) => {
+    const key = p.name.replace(/_id$/, '') + '01'
+    return { name: p.name, key }
+  })
+
+  let liveParamsBlock = ''
+  if (hasList) {
+    const listParamLines = liveListParams.map((lp: any) =>
+      `        ${lp.name}: setup.idmap['${lp.key}'],`).join('\n')
+    const ancestorParamLines = liveAncestorParams.map((lp: any) =>
+      `      params.${lp.name} = setup.idmap['${lp.key}']`).join('\n')
+
+    liveParamsBlock = `    if (setup.live) {
+      const listResult: any = await client.direct({
+        path: '${listPath}',
+        method: 'GET',
+        params: {
+${listParamLines}
+        },
+      })
+      assert(listResult.ok === true)
+      const listData = listResult.data
+      if (!Array.isArray(listData) || listData.length === 0) {
+        return // skip: no entities to load in live mode
+      }
+      params.id = listData[0].id
+${ancestorParamLines}
+    } else {
+${loadParams.map((p: any, i: number) => `      params.${p.name} = 'direct0${i + 1}'`).join('\n')}
+    }`
+  } else {
+    liveParamsBlock = `    if (!setup.live) {
+${loadParams.map((p: any, i: number) => `      params.${p.name} = 'direct0${i + 1}'`).join('\n')}
+    }`
+  }
+
+  Content(`
+  test('direct-load-${entity.name}', async () => {
+    const setup = directSetup({ id: 'direct01' })
+    const { client, calls } = setup
+
+    const params: any = {}
+${liveParamsBlock}
+
+    const result: any = await client.direct({
+      path: '${loadPath}',
+      method: 'GET',
+      params,
+    })
+
+    assert(result.ok === true)
+    assert(result.status === 200)
+    assert(null != result.data)
+
+    if (!setup.live) {
+      assert(result.data.id === 'direct01')
+      assert(calls.length === 1)
+      assert(calls[0].init.method === 'GET')
+${paramAsserts}    }
+  })
+`)
+}
+
+
+function generateDirectList(model: any, entity: any) {
+  const listOp = entity.op.list
+  const listTarget = listOp.targets[0]
+
+  if (null == listTarget) {
+    return
+  }
+
+  const listPath = (listTarget.parts || []).join('/')
+  const listParams = listTarget.args?.params || []
+
+  // Build live params
+  const liveParams = listParams.map((p: any) => {
+    const key = p.name === 'id'
+      ? entity.name + '01'
+      : p.name.replace(/_id$/, '') + '01'
+    return { name: p.name, key }
+  })
+
+  const paramAsserts = listParams.map((p: any, i: number) =>
+    '      assert(calls[0].url.includes(\'direct0' + (i + 1) + '\'))\n').join('')
+
+  let paramsBlock = ''
+  if (listParams.length > 0) {
+    const liveLines = liveParams.map((lp: any) =>
+      `      params.${lp.name} = setup.idmap['${lp.key}']`).join('\n')
+    const mockLines = listParams.map((p: any, i: number) =>
+      `      params.${p.name} = 'direct0${i + 1}'`).join('\n')
+
+    paramsBlock = `    const params: any = {}
+    if (setup.live) {
+${liveLines}
+    } else {
+${mockLines}
+    }
+`
+  } else {
+    paramsBlock = `    const params: any = {}
+`
+  }
+
+  Content(`
+  test('direct-list-${entity.name}', async () => {
+    const setup = directSetup([{ id: 'direct01' }, { id: 'direct02' }])
+    const { client, calls } = setup
+
+${paramsBlock}
+    const result: any = await client.direct({
+      path: '${listPath}',
+      method: 'GET',
+      params,
+    })
+
+    assert(result.ok === true)
+    assert(result.status === 200)
+    assert(Array.isArray(result.data))
+
+    if (!setup.live) {
+      assert(result.data.length === 2)
+      assert(calls.length === 1)
+      assert(calls[0].init.method === 'GET')
+${paramAsserts}    }
+  })
+`)
+}
+
+
+export {
+  TestDirect
+}

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

@@ -189,10 +189,18 @@ const generateCreate: OpGen = (
   Content(`
     // CREATE
     const ${entvar} = client.${nom(entity, 'Name')}()
-    const ${datavar} =
-      await ${entvar}.create(setup.data.new.${entity.name}['${ref}'])
+    let ${datavar} = setup.data.new.${entity.name}['${ref}']
+`)
+
+  each(step.match, (mi: any) => {
+    Content(`    ${datavar}['${mi.key$}'] = setup.idmap['${mi.val$}']
+`)
+  })
+
+  Content(`
+    ${datavar} = await ${entvar}.create(${datavar})
     assert(null != ${datavar}.id)
-  `)
+`)
 }
 
 
@@ -211,11 +219,11 @@ const generateList: OpGen = (
   Content(`
     // LIST
     const ${matchvar}: any = {}
-  `)
+`)
 
   each(step.match, (mi: any) => {
-    Content(`    ${matchvar}['${mi.key$}'] = setup.idmap['${mi.key$}']
-  `)
+    Content(`    ${matchvar}['${mi.key$}'] = setup.idmap['${mi.val$}']
+`)
   })
 
   Content(`

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

@@ -13,6 +13,7 @@ import { cmp, each, Folder } from '@voxgig/sdkgen'
 
 // import { Quick } from './Quick_ts'
 // import { TestMain } from './TestMain_ts'
+import { TestDirect } from './TestDirect_ts'
 import { TestEntity } from './TestEntity_ts'
 
 
@@ -27,6 +28,7 @@ const Test = cmp(function Test(props: any) {
     Folder({ name: 'entity' }, () => {
       each(model.main[KIT].entity, (entity: ModelEntity) => {
         TestEntity({ target, entity })
+        TestDirect({ target, entity })
       })
     })
   })

package/project/.sdk/src/cmp/ts/fragment/Direct.test.fragment.ts

@@ -0,0 +1,30 @@
+
+const envlocal = __dirname + '/../../../.env.local'
+require('dotenv').config({ quiet: true, path: [envlocal] })
+
+import { test, describe } from 'node:test'
+import assert from 'node:assert'
+
+
+import { ProjectNameSDK } from '../../..'
+
+import {
+  envOverride,
+} from '../../utility'
+
+
+describe('EntityNameDirect', async () => {
+
+  test('direct-exists', async () => {
+    const sdk = new ProjectNameSDK({
+      system: { fetch: async () => ({}) }
+    })
+    assert('function' === typeof sdk.direct)
+    assert('function' === typeof sdk.prepare)
+  })
+
+  // <[SLOT:direct]>
+})
+
+
+// <[SLOT:directSetup]>

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

@@ -18,11 +18,11 @@ class EntityOperation {
       done,
       error,
       featureHook,
-      selection,
-      request,
-      response,
-      result,
-      spec,
+      makeTarget,
+      makeRequest,
+      makeResponse,
+      makeResult,
+      makeSpec,
     } = utility
 
     let fres: Promise<any> | undefined = undefined
@@ -38,15 +38,15 @@ class EntityOperation {
     try {
       // #PreSelection-Hook    
 
-      ctx.out.selected = selection(ctx)
-      if (ctx.out.selected instanceof Error) {
-        return error(ctx, ctx.out.selected)
+      ctx.out.target = makeTarget(ctx)
+      if (ctx.out.target instanceof Error) {
+        return error(ctx, ctx.out.target)
       }
 
 
       // #PreSpec-Hook
 
-      ctx.out.spec = spec(ctx)
+      ctx.out.spec = makeSpec(ctx)
       if (ctx.out.spec instanceof Error) {
         return error(ctx, ctx.out.spec)
       }
@@ -54,7 +54,7 @@ class EntityOperation {
 
       // #PreRequest-Hook
 
-      ctx.out.request = await request(ctx)
+      ctx.out.request = await makeRequest(ctx)
       if (ctx.out.request instanceof Error) {
         return error(ctx, ctx.out.request)
       }
@@ -62,7 +62,7 @@ class EntityOperation {
 
       // #PreResponse-Hook
 
-      ctx.out.response = await response(ctx)
+      ctx.out.response = await makeResponse(ctx)
       if (ctx.out.response instanceof Error) {
         return error(ctx, ctx.out.response)
       }
@@ -70,7 +70,7 @@ class EntityOperation {
 
       // #PreResult-Hook
 
-      ctx.out.result = await result(ctx)
+      ctx.out.result = await makeResult(ctx)
       if (ctx.out.result instanceof Error) {
         return error(ctx, ctx.out.result)
       }

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

@@ -19,11 +19,11 @@ class EntityOperation {
       done,
       error,
       featureHook,
-      selection,
-      request,
-      response,
-      result,
-      spec,
+      makeTarget,
+      makeRequest,
+      makeResponse,
+      makeResult,
+      makeSpec,
     } = utility
 
     let fres: Promise<any> | undefined = undefined
@@ -39,15 +39,15 @@ class EntityOperation {
     try {
       // #PreSelection-Hook    
 
-      ctx.out.selected = selection(ctx)
-      if (ctx.out.selected instanceof Error) {
-        return error(ctx, ctx.out.selected)
+      ctx.out.target = makeTarget(ctx)
+      if (ctx.out.target instanceof Error) {
+        return error(ctx, ctx.out.target)
       }
 
 
       // #PreSpec-Hook
 
-      ctx.out.spec = spec(ctx)
+      ctx.out.spec = makeSpec(ctx)
       if (ctx.out.spec instanceof Error) {
         return error(ctx, ctx.out.spec)
       }
@@ -55,7 +55,7 @@ class EntityOperation {
 
       // #PreRequest-Hook
 
-      ctx.out.request = await request(ctx)
+      ctx.out.request = await makeRequest(ctx)
       if (ctx.out.request instanceof Error) {
         return error(ctx, ctx.out.request)
       }
@@ -63,7 +63,7 @@ class EntityOperation {
 
       // #PreResponse-Hook
 
-      ctx.out.response = await response(ctx)
+      ctx.out.response = await makeResponse(ctx)
       if (ctx.out.response instanceof Error) {
         return error(ctx, ctx.out.response)
       }
@@ -71,7 +71,7 @@ class EntityOperation {
 
       // #PreResult-Hook
 
-      ctx.out.result = await result(ctx)
+      ctx.out.result = await makeResult(ctx)
       if (ctx.out.result instanceof Error) {
         return error(ctx, ctx.out.result)
       }

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

@@ -19,11 +19,11 @@ class EntityOperation {
       done,
       error,
       featureHook,
-      selection,
-      request,
-      response,
-      result,
-      spec,
+      makeTarget,
+      makeRequest,
+      makeResponse,
+      makeResult,
+      makeSpec,
     } = utility
 
     let fres: Promise<any> | undefined = undefined
@@ -39,15 +39,15 @@ class EntityOperation {
     try {
       // #PreSelection-Hook    
 
-      ctx.out.selected = selection(ctx)
-      if (ctx.out.selected instanceof Error) {
-        return error(ctx, ctx.out.selected)
+      ctx.out.target = makeTarget(ctx)
+      if (ctx.out.target instanceof Error) {
+        return error(ctx, ctx.out.target)
       }
 
 
       // #PreSpec-Hook
 
-      ctx.out.spec = spec(ctx)
+      ctx.out.spec = makeSpec(ctx)
       if (ctx.out.spec instanceof Error) {
         return error(ctx, ctx.out.spec)
       }
@@ -55,7 +55,7 @@ class EntityOperation {
 
       // #PreRequest-Hook
 
-      ctx.out.request = await request(ctx)
+      ctx.out.request = await makeRequest(ctx)
       if (ctx.out.request instanceof Error) {
         return error(ctx, ctx.out.request)
       }
@@ -63,7 +63,7 @@ class EntityOperation {
 
       // #PreResponse-Hook
 
-      ctx.out.response = await response(ctx)
+      ctx.out.response = await makeResponse(ctx)
       if (ctx.out.response instanceof Error) {
         return error(ctx, ctx.out.response)
       }
@@ -71,7 +71,7 @@ class EntityOperation {
 
       // #PreResult-Hook
 
-      ctx.out.result = await result(ctx)
+      ctx.out.result = await makeResult(ctx)
       if (ctx.out.result instanceof Error) {
         return error(ctx, ctx.out.result)
       }

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

@@ -19,11 +19,11 @@ class EntityOperation {
       done,
       error,
       featureHook,
-      selection,
-      request,
-      response,
-      result,
-      spec,
+      makeTarget,
+      makeRequest,
+      makeResponse,
+      makeResult,
+      makeSpec,
     } = utility
 
     let fres: Promise<any> | undefined = undefined
@@ -38,17 +38,17 @@ class EntityOperation {
 
     try {
 
-      // #PreOperation-Hook    
+      // #PreTarget-Hook    
 
-      ctx.out.selected = selection(ctx)
-      if (ctx.out.selected instanceof Error) {
-        return error(ctx, ctx.out.selected)
+      ctx.out.target = makeTarget(ctx)
+      if (ctx.out.target instanceof Error) {
+        return error(ctx, ctx.out.target)
       }
 
 
       // #PreSpec-Hook
 
-      ctx.out.spec = spec(ctx)
+      ctx.out.spec = makeSpec(ctx)
       if (ctx.out.spec instanceof Error) {
         return error(ctx, ctx.out.spec)
       }
@@ -56,7 +56,7 @@ class EntityOperation {
 
       // #PreRequest-Hook
 
-      ctx.out.request = await request(ctx)
+      ctx.out.request = await makeRequest(ctx)
       if (ctx.out.request instanceof Error) {
         return error(ctx, ctx.out.request)
       }
@@ -64,7 +64,7 @@ class EntityOperation {
 
       // #PreResponse-Hook
 
-      ctx.out.response = await response(ctx)
+      ctx.out.response = await makeResponse(ctx)
       if (ctx.out.response instanceof Error) {
         return error(ctx, ctx.out.response)
       }
@@ -72,7 +72,7 @@ class EntityOperation {
 
       // #PreResult-Hook
 
-      ctx.out.result = await result(ctx)
+      ctx.out.result = await makeResult(ctx)
       if (ctx.out.result instanceof Error) {
         return error(ctx, ctx.out.result)
       }