@voxgig/sdkgen 0.44.0 → 1.0.1

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

@@ -206,16 +206,32 @@ function ProjectNameSDK:direct(fetchargs)
 
   if type(fetched) == "table" then
     local status = helpers.to_int(vs.getprop(fetched, "status"))
+    local headers = vs.getprop(fetched, "headers") or {}
+
+    -- No-body responses (204, 304) and explicit zero content-length
+    -- must skip JSON parsing — calling json() on an empty body errors.
+    local content_length = nil
+    if type(headers) == "table" then
+      content_length = headers["content-length"]
+    end
+    local no_body = status == 204 or status == 304 or tostring(content_length) == "0"
+
     local json_data = nil
-    local jf = vs.getprop(fetched, "json")
-    if type(jf) == "function" then
-      json_data = jf()
+    if not no_body then
+      local jf = vs.getprop(fetched, "json")
+      if type(jf) == "function" then
+        local ok, result = pcall(jf)
+        if ok then
+          json_data = result
+        end
+        -- Non-JSON body: json_data stays nil, status/headers preserved.
+      end
     end
 
     return {
       ok = status >= 200 and status < 300,
       status = status,
-      headers = vs.getprop(fetched, "headers"),
+      headers = headers,
       data = json_data,
     }, nil
   end

package/project/.sdk/src/cmp/php/Config_php.ts

@@ -9,6 +9,7 @@ import {
   Line,
   cmp,
   each,
+  isAuthActive,
 } from '@voxgig/sdkgen'
 
 
@@ -37,12 +38,19 @@ const Config = cmp(async function Config(props: any) {
 
   const headers = getModelPath(model, `main.${KIT}.config.headers`) || {}
 
+  const authActive = isAuthActive(model)
   let authPrefix = ''
   try { authPrefix = getModelPath(model, `main.${KIT}.config.auth.prefix`) } catch (_e) { }
 
   let baseUrl = ''
   try { baseUrl = getModelPath(model, `main.${KIT}.info.servers.0.url`) } catch (_e) { }
 
+  const authBlock = authActive
+    ? `                "auth" => [
+                    "prefix" => "${authPrefix}",
+                ],\n`
+    : ''
+
   File({ name: 'config.' + target.ext }, () => {
 
     Content(`<?php
@@ -75,10 +83,7 @@ class ${model.const.Name}Config
       Content(`            ],
             "options" => [
                 "base" => "${baseUrl}",
-                "auth" => [
-                    "prefix" => "${authPrefix}",
-                ],
-                "headers" => ${formatPhpArray(headers, 4)},
+${authBlock}                "headers" => ${formatPhpArray(headers, 4)},
                 "entity" => (object)[],
             ],
             "entity" => (object)[],
@@ -88,10 +93,7 @@ class ${model.const.Name}Config
     Content(`            ],
             "options" => [
                 "base" => "${baseUrl}",
-                "auth" => [
-                    "prefix" => "${authPrefix}",
-                ],
-                "headers" => ${formatPhpArray(headers, 4)},
+${authBlock}                "headers" => ${formatPhpArray(headers, 4)},
                 "entity" => [
 `)
 

package/project/.sdk/src/cmp/php/Package_php.ts

@@ -18,10 +18,16 @@ const Package = cmp(async function Package(props: any) {
 
   const model: Model = ctx$.model
 
+  // Package namespace mirrors the npm scope (model.origin, e.g. "voxgig-sdk").
+  // If origin already ends in "-sdk" the slug stands alone; otherwise append
+  // "-sdk" (matches the TS Package generator).
+  const ns = model.origin || 'voxgig-sdk'
+  const pkgBase = ns.endsWith('-sdk') ? model.name : `${model.name}-sdk`
+
   // Generate composer.json
   File({ name: 'composer.json' }, () => {
     Content(`{
-  "name": "voxgig/${model.name}-sdk",
+  "name": "${ns}/${pkgBase}",
   "description": "${model.const.Name} SDK for PHP",
   "type": "library",
   "license": "MIT",

package/project/.sdk/src/cmp/php/ReadmeEntity_php.ts

@@ -0,0 +1,138 @@
+
+import { cmp, each, Content } from '@voxgig/sdkgen'
+
+import {
+  KIT,
+  getModelPath,
+} from '@voxgig/apidef'
+
+
+// Operation method spelling differs between Go and other languages — Go
+// uses PascalCase methods with explicit ctrl arg, others use lowercase
+// methods with optional ctrl. The op descriptions are language-agnostic.
+const OP_DESC: Record<string, { method: string, desc: string }> = {
+  load:   { method: 'load(match)',   desc: 'Load a single entity by match criteria.' },
+  list:   { method: 'list(match)',   desc: 'List entities matching the criteria.' },
+  create: { method: 'create(data)',  desc: 'Create a new entity with the given data.' },
+  update: { method: 'update(data)',  desc: 'Update an existing entity.' },
+  remove: { method: 'remove(match)', desc: 'Remove the matching entity.' },
+}
+
+
+const ReadmeEntity = cmp(function ReadmeEntity(props: any) {
+  const { target } = props
+  const { model } = props.ctx$
+
+  const entity = getModelPath(model, `main.${KIT}.entity`)
+
+  const publishedEntities = each(entity)
+    .filter((entity: any) => entity.active !== false)
+
+  if (0 === publishedEntities.length) {
+    return
+  }
+
+  Content(`
+
+## Entities
+
+`)
+
+  publishedEntities.map((entity: any) => {
+    const opnames = Object.keys(entity.op || {})
+    const fields = entity.fields || []
+
+    Content(`
+### ${entity.Name}
+
+`)
+
+    if (entity.short) {
+      Content(`${entity.short}
+
+`)
+    }
+
+    Content(`Create an instance: \`const ${entity.name} = client.${entity.Name}()\`
+
+`)
+
+    if (opnames.length > 0) {
+      Content(`#### Operations
+
+| Method | Description |
+| --- | --- |
+`)
+      opnames.map((opname: string) => {
+        const info = OP_DESC[opname]
+        if (info) {
+          Content(`| \`${info.method}\` | ${info.desc} |
+`)
+        }
+      })
+
+      Content(`
+`)
+    }
+
+    if (fields.length > 0) {
+      Content(`#### Fields
+
+| Field | Type | Description |
+| --- | --- | --- |
+`)
+
+      each(fields, (field: any) => {
+        const desc = field.short || ''
+        Content(`| \`${field.name}\` | \`${field.type || 'any'}\` | ${desc} |
+`)
+      })
+
+      Content(`
+`)
+    }
+
+    if (opnames.includes('load')) {
+      Content(`#### Example: Load
+
+\`\`\`ts
+const ${entity.name} = await client.${entity.Name}().load({ id: '${entity.name}_id' })
+\`\`\`
+
+`)
+    }
+
+    if (opnames.includes('list')) {
+      Content(`#### Example: List
+
+\`\`\`ts
+const ${entity.name}s = await client.${entity.Name}().list()
+\`\`\`
+
+`)
+    }
+
+    if (opnames.includes('create')) {
+      Content(`#### Example: Create
+
+\`\`\`ts
+const ${entity.name} = await client.${entity.Name}().create({
+`)
+      each(fields, (field: any) => {
+        if ('id' !== field.name && field.req) {
+          Content(`  ${field.name}: /* ${field.type || 'value'} */,
+`)
+        }
+      })
+      Content(`})
+\`\`\`
+
+`)
+    }
+  })
+})
+
+
+export {
+  ReadmeEntity
+}

package/project/.sdk/src/cmp/php/ReadmeHowto_php.ts

@@ -1,10 +1,14 @@
 
-import { cmp, Content } from '@voxgig/sdkgen'
+import { cmp, Content, isAuthActive } from '@voxgig/sdkgen'
 
 
 const ReadmeHowto = cmp(function ReadmeHowto(props: any) {
   const { target, ctx$: { model } } = props
 
+  const apikeyEnvLine = isAuthActive(model)
+    ? `\n${model.NAME}_APIKEY=<your-key>`
+    : ''
+
   Content(`### Make a direct HTTP request
 
 For endpoints not covered by entity methods:
@@ -81,8 +85,7 @@ $client = new ${model.const.Name}SDK([
 Create a \`.env.local\` file at the project root:
 
 \`\`\`
-${model.NAME}_TEST_LIVE=TRUE
-${model.NAME}_APIKEY=<your-key>
+${model.NAME}_TEST_LIVE=TRUE${apikeyEnvLine}
 \`\`\`
 
 Then run:

package/project/.sdk/src/cmp/php/ReadmeIntro_php.ts

@@ -0,0 +1,18 @@
+
+import { cmp, Content } from '@voxgig/sdkgen'
+
+
+const ReadmeIntro = cmp(function ReadmeIntro(props: any) {
+  const { target, ctx$: { model } } = props
+
+  Content(`# ${model.Name} ${target.title} SDK
+
+The ${target.title} SDK for the ${model.Name} API. Provides an entity-oriented interface using PHP conventions.
+
+`)
+})
+
+
+export {
+  ReadmeIntro
+}

package/project/.sdk/src/cmp/php/ReadmeModel_php.ts

@@ -1,5 +1,5 @@
 
-import { cmp, each, Content } from '@voxgig/sdkgen'
+import { cmp, each, Content, isAuthActive } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -13,6 +13,10 @@ const ReadmeModel = cmp(function ReadmeModel(props: any) {
   const entity = getModelPath(model, `main.${KIT}.entity`)
   const entityList = each(entity).filter((e: any) => e.active !== false)
 
+  const apikeyOptionRow = isAuthActive(model)
+    ? '| `apikey` | `string` | API key for authentication. |\n'
+    : ''
+
   Content(`### ${model.const.Name}SDK
 
 \`\`\`php
@@ -24,8 +28,7 @@ Creates a new SDK client.
 
 | Option | Type | Description |
 | --- | --- | --- |
-| \`apikey\` | \`string\` | API key for authentication. |
-| \`base\` | \`string\` | Base URL of the API server. |
+${apikeyOptionRow}| \`base\` | \`string\` | Base URL of the API server. |
 | \`prefix\` | \`string\` | URL path prefix prepended to all requests. |
 | \`suffix\` | \`string\` | URL path suffix appended to all requests. |
 | \`feature\` | \`array\` | Feature activation flags. |

package/project/.sdk/src/cmp/php/ReadmeOptions_php.ts

@@ -0,0 +1,58 @@
+
+import { cmp, each, Content } from '@voxgig/sdkgen'
+
+
+const ReadmeOptions = cmp(function ReadmeOptions(props: any) {
+  const { target } = props
+  const { model } = props.ctx$
+
+  const publishedOptions = each(target.options).filter((option: any) => option.publish)
+  if (0 === publishedOptions.length) {
+    return
+  }
+
+  Content(`
+
+## Options
+
+Pass options when creating a client instance:
+
+`)
+
+  Content(`\`\`\`php
+$client = new ${model.Name}SDK([
+`)
+
+  publishedOptions.map((option: any) => {
+    if ('apikey' === option.name) {
+      Content(`    "${option.name}" => getenv("${model.NAME}_APIKEY"),
+`)
+    }
+    else {
+      Content(`    // "${option.name}" => ${option.kind === 'string' ? '"..."' : '...'},
+`)
+    }
+  })
+
+  Content(`]);
+\`\`\`
+
+`)
+
+  Content(`| Option | Type | Description |
+| --- | --- | --- |
+`)
+
+  publishedOptions.map((option: any) => {
+    Content(`| \`${option.name}\` | \`${option.kind}\` | ${option.short} |
+`)
+  })
+
+  Content(`
+`)
+})
+
+
+export {
+  ReadmeOptions
+}

package/project/.sdk/src/cmp/php/ReadmeQuick_php.ts

@@ -1,5 +1,5 @@
 
-import { cmp, each, Content } from '@voxgig/sdkgen'
+import { cmp, each, Content, isAuthActive } from '@voxgig/sdkgen'
 
 import {
   KIT,
@@ -18,15 +18,17 @@ const ReadmeQuick = cmp(function ReadmeQuick(props: any) {
     e.active !== false && e.ancestors && e.ancestors.length > 0
   ) as any
 
+  const apikeyArg = isAuthActive(model)
+    ? `\n    "apikey" => getenv("${model.NAME}_APIKEY"),\n`
+    : ''
+
   Content(`### 1. Create a client
 
 \`\`\`php
 <?php
 require_once '${model.const.Name.toLowerCase()}_sdk.php';
 
-$client = new ${model.const.Name}SDK([
-    "apikey" => getenv("${model.NAME}_APIKEY"),
-]);
+$client = new ${model.const.Name}SDK([${apikeyArg}]);
 \`\`\`
 
 `)