@carthooks/arcubase-cli 0.1.25 → 0.1.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundle/arcubase-admin.mjs +813 -448
- package/bundle/arcubase.mjs +813 -448
- package/dist/generated/zod_registry.generated.d.ts.map +1 -1
- package/dist/generated/zod_registry.generated.js +3 -3
- package/dist/runtime/execute.d.ts.map +1 -1
- package/dist/runtime/execute.js +118 -11
- package/package.json +2 -2
- package/sdk-dist/docs/runtime-reference/dev-sdk-gen.md +14 -10
- package/sdk-dist/generated/zod_registry.generated.ts +3 -3
- package/sdk-dist/types/common.ts +1 -0
- package/sdk-dist/types/ingress.ts +15 -0
- package/sdk-dist/types/user-action.ts +1 -0
- package/src/generated/zod_registry.generated.ts +3 -3
- package/src/runtime/execute.ts +126 -11
- package/src/tests/dev_sdk_gen.test.ts +128 -39
- package/src/tests/help.test.ts +2 -1
- package/src/tests/zod_registry.test.ts +1 -0
- package/dist/runtime/dev_sdk_gen.d.ts +0 -4
- package/dist/runtime/dev_sdk_gen.d.ts.map +0 -1
- package/dist/runtime/dev_sdk_gen.js +0 -13
- package/src/runtime/dev_sdk_gen.ts +0 -20
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zod_registry.generated.d.ts","sourceRoot":"","sources":["../../src/generated/zod_registry.generated.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAO,MAAM,6BAA6B,EAAE,CAAC,CAAC,UAAwJ,CAAA;AAEtM,eAAO,MAAM,0BAA0B,EAAE,CAAC,CAAC,UAAgH,CAAA;AAE3J,eAAO,MAAM,cAAc,EAAE,CAAC,CAAC,UAA2D,CAAA;AAE1F,eAAO,MAAM,kBAAkB,EAAE,CAAC,CAAC,UAAsJ,CAAA;AAEzL,eAAO,MAAM,wBAAwB,EAAE,CAAC,CAAC,UAAoV,CAAA;AAE7X,eAAO,MAAM,sBAAsB,EAAE,CAAC,CAAC,UAA4C,CAAA;AAEnF,eAAO,MAAM,qBAAqB,EAAE,CAAC,CAAC,UAA8E,CAAA;AAEpH,eAAO,MAAM,2BAA2B,EAAE,CAAC,CAAC,UAAiT,CAAA;AAE7V,eAAO,MAAM,wBAAwB,EAAE,CAAC,CAAC,UAA8I,CAAA;AAEvL,eAAO,MAAM,yBAAyB,EAAE,CAAC,CAAC,UAA0M,CAAA;AAEpP,eAAO,MAAM,4BAA4B,EAAE,CAAC,CAAC,UAA4L,CAAA;AAEzO,eAAO,MAAM,6BAA6B,EAAE,CAAC,CAAC,UAAub,CAAA;AAEre,eAAO,MAAM,uBAAuB,EAAE,CAAC,CAAC,UAAiL,CAAA;AAEzN,eAAO,MAAM,kBAAkB,EAAE,CAAC,CAAC,UAA2Z,CAAA;AAE9b,eAAO,MAAM,qBAAqB,EAAE,CAAC,CAAC,UAAqL,CAAA;AAE3N,eAAO,MAAM,0BAA0B,EAAE,CAAC,CAAC,UAAoP,CAAA;AAE/R,eAAO,MAAM,+BAA+B,EAAE,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"zod_registry.generated.d.ts","sourceRoot":"","sources":["../../src/generated/zod_registry.generated.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,10 +16,10 @@ export const PermitFieldPermitSchema = z.lazy(() => z.object({ "key": z.string()
|
|
|
16
16
|
export const PermitPolicySchema = z.lazy(() => z.object({ "actions": z.array(z.string()).optional(), "all_fields_read": z.boolean().optional(), "all_fields_write": z.boolean().optional(), "condition": PermitConditionSetSchema.optional(), "description": z.string().optional(), "fields": z.array(PermitFieldPermitSchema).optional(), "id": z.string().optional(), "key": z.string().optional(), "name": z.string().optional() }).strict());
|
|
17
17
|
export const PermitUserScopeSchema = z.lazy(() => z.object({ "data": z.object({ "name": z.string().optional() }).strict().optional(), "id": z.number().optional(), "type": z.string().optional() }).strict());
|
|
18
18
|
export const EntityIngressOptionsSchema = z.lazy(() => z.object({ "i18n_name": I18NTextSchema.optional(), "list_options": PermitEntityListOptionsSchema.optional(), "policy": PermitPolicySchema.optional(), "user_scope": z.array(PermitUserScopeSchema).optional() }).strict());
|
|
19
|
-
export const AppIngressBulkApplyItemVOSchema = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "rule_id": z.number().optional(), "table_id": z.number().optional(), "type": z.string().optional() }).strict());
|
|
19
|
+
export const AppIngressBulkApplyItemVOSchema = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "key": z.string().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "rule_id": z.number().optional(), "table_id": z.number().optional(), "type": z.string().optional() }).strict());
|
|
20
20
|
export const AppIngressBulkApplyReqVOSchema = z.lazy(() => z.object({ "dry_run": z.boolean().optional(), "items": z.array(AppIngressBulkApplyItemVOSchema).optional(), "mode": z.string().optional() }).strict());
|
|
21
|
-
export const AppIngressCreateReqVOSchema = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "entity_id": z.number().optional(), "icon_name": z.string().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "type": z.string().optional(), "url": z.string().optional() }).strict());
|
|
22
|
-
export const AppIngressUpdateReqVOSchema = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "update": z.array(z.string()).optional() }).strict());
|
|
21
|
+
export const AppIngressCreateReqVOSchema = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "entity_id": z.number().optional(), "icon_name": z.string().optional(), "key": z.string().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "type": z.string().optional(), "url": z.string().optional() }).strict());
|
|
22
|
+
export const AppIngressUpdateReqVOSchema = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "key": z.string().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "update": z.array(z.string()).optional() }).strict());
|
|
23
23
|
export const WidgetsTypeCodeSchema = z.lazy(() => z.union([z.literal(1), z.literal(2)]));
|
|
24
24
|
export const WidgetsTypeSchema = z.lazy(() => z.object({ "dashboard_id": z.number().optional(), "ingress_id": z.number().optional(), "type": WidgetsTypeCodeSchema.optional() }).strict());
|
|
25
25
|
export const AppNewWidgetsReqVOSchema = z.lazy(() => z.object({ "options": WidgetsTypeSchema.optional(), "type": z.string().optional() }).strict());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/runtime/execute.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/runtime/execute.ts"],"names":[],"mappings":"AAIA,OAAO,EAAkB,KAAK,UAAU,EAAE,MAAM,UAAU,CAAA;AAG1D,OAAO,EAAyF,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAQhJ,MAAM,MAAM,uBAAuB,GAAG;IACpC,KAAK,EAAE,YAAY,CAAA;IACnB,WAAW,EAAE,SAAS,MAAM,EAAE,CAAA;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,SAAS,EAAE,SAAS,MAAM,EAAE,CAAA;IAC5B,UAAU,EAAE,SAAS,MAAM,EAAE,CAAA;CAC9B,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAe1D;AAaD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAE,QAAsB,GAAG,MAAM,CAoB7G;AA8BD,KAAK,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;AAUlD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,GAAE,QAAsB,GAAG,MAAM,CA8HpI;AAg0ED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,uBAAuB,CActH;AAED,wBAAsB,UAAU,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,UAAU,EAAE,SAAS,GAAE,OAAO,KAAa,GAAG,OAAO,CAAC,GAAG,CAAC,CAyOrI"}
|
package/dist/runtime/execute.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
2
|
import path from 'path';
|
|
3
|
+
import { ArcubaseCodeGenError, generateArcubaseProjectSDK } from '@arcubase/code-gen';
|
|
3
4
|
import { parseCLIArgs, hasFlag, flagValue } from './argv.js';
|
|
4
5
|
import { loadRuntimeEnv } from './env.js';
|
|
5
6
|
import { CLIError } from './errors.js';
|
|
@@ -11,7 +12,6 @@ import { resolveArcubaseSDKPath } from './paths.js';
|
|
|
11
12
|
import { compileCSVImportMapping, compileExcelImportMapping } from './entity_import_mapping.js';
|
|
12
13
|
import { uploadLocalFileWithToken } from './local_upload.js';
|
|
13
14
|
import { renderCommandHelpExamples } from './help_examples.js';
|
|
14
|
-
import { generateArcubaseProjectSDK } from './dev_sdk_gen.js';
|
|
15
15
|
export function renderRootHelp(scope) {
|
|
16
16
|
const binary = scope === 'admin' ? 'arcubase-admin' : 'arcubase';
|
|
17
17
|
const modules = scope === 'admin' ? [...listModules(scope), 'dev'].sort() : listModules(scope);
|
|
@@ -267,10 +267,10 @@ function renderDevSDKGenHelp() {
|
|
|
267
267
|
' - arcubase-admin dev sdk-gen --app-id <app_id> --out src/arcubase',
|
|
268
268
|
'',
|
|
269
269
|
'requirements:',
|
|
270
|
+
' - every generated ingress must have a configured ingress.key; sdk-gen fails fast when keys are missing',
|
|
270
271
|
' - every generated field must have a configured field.key; sdk-gen fails fast when keys are missing',
|
|
271
|
-
' -
|
|
272
|
-
' -
|
|
273
|
-
' - generated code accepts createArcubaseSdk({ baseURL, accessToken, refreshToken })',
|
|
272
|
+
' - ingress.key and field.key values must be stable unique TypeScript identifiers',
|
|
273
|
+
' - generated code accepts createArcubaseClient({ baseURL, accessToken, refreshToken }).ingress("<IngressKey>")',
|
|
274
274
|
].join('\n');
|
|
275
275
|
}
|
|
276
276
|
function resolveEndpoint(command, flags) {
|
|
@@ -1679,6 +1679,89 @@ function assertSDKGenFieldKeysPresent(entity) {
|
|
|
1679
1679
|
],
|
|
1680
1680
|
});
|
|
1681
1681
|
}
|
|
1682
|
+
function extractSDKGenIngressRefs(payload) {
|
|
1683
|
+
const data = unwrapResponseData(payload);
|
|
1684
|
+
const source = Array.isArray(data)
|
|
1685
|
+
? data
|
|
1686
|
+
: isRecord(data) && Array.isArray(data.list)
|
|
1687
|
+
? data.list
|
|
1688
|
+
: [];
|
|
1689
|
+
return source.filter((item) => isRecord(item));
|
|
1690
|
+
}
|
|
1691
|
+
function ingressKeyOf(ingress) {
|
|
1692
|
+
return typeof ingress.key === 'string' ? ingress.key.trim() : '';
|
|
1693
|
+
}
|
|
1694
|
+
function ingressHashIDOf(ingress) {
|
|
1695
|
+
if (typeof ingress.hash_id === 'string' && ingress.hash_id.trim()) {
|
|
1696
|
+
return ingress.hash_id.trim();
|
|
1697
|
+
}
|
|
1698
|
+
if (typeof ingress.hashId === 'string' && ingress.hashId.trim()) {
|
|
1699
|
+
return ingress.hashId.trim();
|
|
1700
|
+
}
|
|
1701
|
+
return '';
|
|
1702
|
+
}
|
|
1703
|
+
function assertSDKGenIngressesReady(ingresses) {
|
|
1704
|
+
if (ingresses.length === 0) {
|
|
1705
|
+
throw new CLIError('SDK_GEN_NO_INGRESSES', 'sdk-gen could not find ingress definitions for this app', 2, {
|
|
1706
|
+
operation: 'dev sdk-gen',
|
|
1707
|
+
suggestions: ['create at least one access rule with a stable ingress.key before running sdk-gen'],
|
|
1708
|
+
});
|
|
1709
|
+
}
|
|
1710
|
+
const seen = new Set();
|
|
1711
|
+
const missingKey = [];
|
|
1712
|
+
const missingHash = [];
|
|
1713
|
+
const invalidKey = [];
|
|
1714
|
+
const duplicateKey = [];
|
|
1715
|
+
for (const ingress of ingresses) {
|
|
1716
|
+
const key = ingressKeyOf(ingress);
|
|
1717
|
+
if (!key) {
|
|
1718
|
+
missingKey.push(ingress);
|
|
1719
|
+
continue;
|
|
1720
|
+
}
|
|
1721
|
+
if (!/^[A-Za-z][A-Za-z0-9_]*$/.test(key)) {
|
|
1722
|
+
invalidKey.push(key);
|
|
1723
|
+
}
|
|
1724
|
+
if (seen.has(key)) {
|
|
1725
|
+
duplicateKey.push(key);
|
|
1726
|
+
}
|
|
1727
|
+
seen.add(key);
|
|
1728
|
+
if (!ingressHashIDOf(ingress)) {
|
|
1729
|
+
missingHash.push(ingress);
|
|
1730
|
+
}
|
|
1731
|
+
}
|
|
1732
|
+
if (missingKey.length > 0) {
|
|
1733
|
+
const preview = missingKey.slice(0, 8).map((ingress) => String(ingress.name ?? ingress.id ?? 'unnamed ingress'));
|
|
1734
|
+
const suffix = missingKey.length > preview.length ? `, and ${missingKey.length - preview.length} more` : '';
|
|
1735
|
+
throw new CLIError('SDK_GEN_INGRESS_KEY_REQUIRED', `missing ingress.key values: ${preview.join(', ')}${suffix}`, 2, {
|
|
1736
|
+
operation: 'dev sdk-gen',
|
|
1737
|
+
issues: missingKey.map((ingress) => ({
|
|
1738
|
+
path: `ingress.${String(ingress.id ?? 'unknown')}.key`,
|
|
1739
|
+
message: `ingress.key is required for ${String(ingress.name ?? ingress.id ?? 'unnamed ingress')}`,
|
|
1740
|
+
})),
|
|
1741
|
+
suggestions: [
|
|
1742
|
+
'set stable ingress.key values in Arcubase admin before running sdk-gen',
|
|
1743
|
+
'rerun arcubase-admin dev sdk-gen after ingress keys are complete',
|
|
1744
|
+
],
|
|
1745
|
+
});
|
|
1746
|
+
}
|
|
1747
|
+
if (invalidKey.length > 0) {
|
|
1748
|
+
throw new CLIError('SDK_GEN_INVALID_INGRESS_KEY', `invalid ingress.key values: ${invalidKey.join(', ')}`, 2, {
|
|
1749
|
+
operation: 'dev sdk-gen',
|
|
1750
|
+
suggestions: ['use TypeScript identifier keys such as publicEntry or customerPortal'],
|
|
1751
|
+
});
|
|
1752
|
+
}
|
|
1753
|
+
if (duplicateKey.length > 0) {
|
|
1754
|
+
throw new CLIError('SDK_GEN_DUPLICATE_INGRESS_KEY', `duplicate ingress.key values: ${duplicateKey.join(', ')}`, 2, {
|
|
1755
|
+
operation: 'dev sdk-gen',
|
|
1756
|
+
});
|
|
1757
|
+
}
|
|
1758
|
+
if (missingHash.length > 0) {
|
|
1759
|
+
throw new CLIError('SDK_GEN_INGRESS_HASH_ID_REQUIRED', 'sdk-gen expected hash_id for every ingress definition', 2, {
|
|
1760
|
+
operation: 'dev sdk-gen',
|
|
1761
|
+
suggestions: ['upgrade Arcubase server so admin access-rule list returns hash_id'],
|
|
1762
|
+
});
|
|
1763
|
+
}
|
|
1764
|
+
}
|
|
1682
1765
|
async function executeDevSDKGen(runtimeEnv, flags, fetchImpl) {
|
|
1683
1766
|
validateDevSDKGenFlags(flags);
|
|
1684
1767
|
const appId = flagValue(flags, 'app-id');
|
|
@@ -1705,7 +1788,7 @@ async function executeDevSDKGen(runtimeEnv, flags, fetchImpl) {
|
|
|
1705
1788
|
if (entityRefs.length === 0) {
|
|
1706
1789
|
throw new CLIError('SDK_GEN_NO_ENTITIES', 'sdk-gen could not find entities in app detail response', 2);
|
|
1707
1790
|
}
|
|
1708
|
-
const
|
|
1791
|
+
const ingresses = [];
|
|
1709
1792
|
for (const entityRef of entityRefs) {
|
|
1710
1793
|
const entityEndpoint = `/api/apps/${encodeURIComponent(appId)}/entity/${encodeURIComponent(entityRef.id)}`;
|
|
1711
1794
|
const entityDetail = await requestJSON(runtimeEnv, 'GET', entityEndpoint, undefined, fetchImpl);
|
|
@@ -1714,13 +1797,37 @@ async function executeDevSDKGen(runtimeEnv, flags, fetchImpl) {
|
|
|
1714
1797
|
throw new CLIError('SDK_GEN_INVALID_SCHEMA', 'sdk-gen expected entity detail response data', 2);
|
|
1715
1798
|
}
|
|
1716
1799
|
assertSDKGenFieldKeysPresent(entityPayload);
|
|
1717
|
-
|
|
1800
|
+
const ingressEndpoint = `/api/apps/${encodeURIComponent(appId)}/entity/${encodeURIComponent(entityRef.id)}/ingress`;
|
|
1801
|
+
const ingressList = await requestJSON(runtimeEnv, 'GET', ingressEndpoint, undefined, fetchImpl);
|
|
1802
|
+
const entityIngresses = extractSDKGenIngressRefs(ingressList.data).map((ingress) => ({
|
|
1803
|
+
...ingress,
|
|
1804
|
+
hash_id: ingressHashIDOf(ingress),
|
|
1805
|
+
key: ingressKeyOf(ingress),
|
|
1806
|
+
entity: entityPayload,
|
|
1807
|
+
}));
|
|
1808
|
+
ingresses.push(...entityIngresses);
|
|
1809
|
+
}
|
|
1810
|
+
assertSDKGenIngressesReady(ingresses);
|
|
1811
|
+
let generated;
|
|
1812
|
+
try {
|
|
1813
|
+
generated = generateArcubaseProjectSDK({
|
|
1814
|
+
id: resolveSDKGenAppId(appId, appPayload),
|
|
1815
|
+
name: typeof appPayload.name === 'string' ? appPayload.name : undefined,
|
|
1816
|
+
ingresses,
|
|
1817
|
+
});
|
|
1818
|
+
}
|
|
1819
|
+
catch (error) {
|
|
1820
|
+
if (error instanceof ArcubaseCodeGenError) {
|
|
1821
|
+
throw new CLIError(error.code, error.message, 2, {
|
|
1822
|
+
operation: 'dev sdk-gen',
|
|
1823
|
+
suggestions: [
|
|
1824
|
+
'set stable ingress.key and field.key values in Arcubase admin before running sdk-gen',
|
|
1825
|
+
'rerun arcubase-admin dev sdk-gen after schema keys are complete',
|
|
1826
|
+
],
|
|
1827
|
+
});
|
|
1828
|
+
}
|
|
1829
|
+
throw error;
|
|
1718
1830
|
}
|
|
1719
|
-
const generated = generateArcubaseProjectSDK({
|
|
1720
|
-
id: resolveSDKGenAppId(appId, appPayload),
|
|
1721
|
-
name: typeof appPayload.name === 'string' ? appPayload.name : undefined,
|
|
1722
|
-
entities,
|
|
1723
|
-
});
|
|
1724
1831
|
const absoluteOutDir = path.resolve(process.cwd(), outDir);
|
|
1725
1832
|
for (const file of generated.files) {
|
|
1726
1833
|
const targetPath = path.resolve(absoluteOutDir, file.path);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@carthooks/arcubase-cli",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.27",
|
|
4
4
|
"description": "Arcubase runtime CLI for admin and user command execution",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"docs:llms": "node -e \"\""
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@arcubase/code-gen": "^0.1.
|
|
34
|
+
"@arcubase/code-gen": "^0.1.1",
|
|
35
35
|
"@carthooks/client-ts": "0.8.0",
|
|
36
36
|
"zod": "^4.4.3"
|
|
37
37
|
},
|
|
@@ -16,24 +16,26 @@ Workbench local ordinary-user codegen must not receive Arcubase admin tokens.
|
|
|
16
16
|
It should use the BotWorks Host/JCode schema flow documented in
|
|
17
17
|
`docs/design/workbench/03-workbench-vibe-coding-arcubase-codegen.md`.
|
|
18
18
|
|
|
19
|
-
Generated code is key based. Application code uses stable `field.key` names
|
|
20
|
-
If any field is missing `field.key`, the command fails before generation and prints the missing
|
|
19
|
+
Generated code is ingress and key based. Application code selects a stable `ingress.key`, then uses stable `field.key` names. Generated runtime code converts those keys to the internal ingress id and numeric field ids.
|
|
20
|
+
If any generated ingress is missing `ingress.key`, or any generated field is missing `field.key`, the command fails before generation and prints the missing keys. Set stable keys in Arcubase admin, then rerun the command.
|
|
21
21
|
|
|
22
22
|
```ts
|
|
23
|
-
import {
|
|
23
|
+
import { createArcubaseClient } from './arcubase'
|
|
24
24
|
|
|
25
|
-
const
|
|
25
|
+
const client = createArcubaseClient({
|
|
26
26
|
baseURL: 'https://team.example.arcubase.co/api',
|
|
27
27
|
accessToken,
|
|
28
28
|
refreshToken,
|
|
29
29
|
})
|
|
30
30
|
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
const api = client.ingress('<IngressKey>')
|
|
32
|
+
|
|
33
|
+
await api.create({
|
|
34
|
+
'<FieldKey>': value,
|
|
33
35
|
})
|
|
34
36
|
|
|
35
|
-
await
|
|
36
|
-
|
|
37
|
+
await api.update(rowId, {
|
|
38
|
+
'<FieldKey>': nextValue,
|
|
37
39
|
})
|
|
38
40
|
```
|
|
39
41
|
|
|
@@ -44,9 +46,11 @@ Arcubase runtime credentials in browser code.
|
|
|
44
46
|
|
|
45
47
|
Rules:
|
|
46
48
|
|
|
49
|
+
- every generated ingress must have a configured `ingress.key`; sdk-gen does not invent fallback keys
|
|
47
50
|
- every visible SDK field must have a configured `field.key`; sdk-gen does not invent fallback keys
|
|
48
|
-
- existing `field.key` values must be stable unique TypeScript identifiers
|
|
51
|
+
- existing `ingress.key` and `field.key` values must be stable unique TypeScript identifiers
|
|
52
|
+
- `ingress.key` is the Web SDK entry contract and should not track display labels
|
|
49
53
|
- `field.key` is a developer API contract and should not track display labels
|
|
50
|
-
-
|
|
54
|
+
- generated Web code starts from `createArcubaseClient(...).ingress('<IngressKey>')`, not entity CRUD
|
|
51
55
|
- row create/update/query code should use generated types, not raw field ids
|
|
52
56
|
- rerun the command after schema changes and commit the regenerated source with the Web project
|
|
@@ -34,13 +34,13 @@ export const PermitUserScopeSchema: z.ZodTypeAny = z.lazy(() => z.object({ "data
|
|
|
34
34
|
|
|
35
35
|
export const EntityIngressOptionsSchema: z.ZodTypeAny = z.lazy(() => z.object({ "i18n_name": I18NTextSchema.optional(), "list_options": PermitEntityListOptionsSchema.optional(), "policy": PermitPolicySchema.optional(), "user_scope": z.array(PermitUserScopeSchema).optional() }).strict())
|
|
36
36
|
|
|
37
|
-
export const AppIngressBulkApplyItemVOSchema: z.ZodTypeAny = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "rule_id": z.number().optional(), "table_id": z.number().optional(), "type": z.string().optional() }).strict())
|
|
37
|
+
export const AppIngressBulkApplyItemVOSchema: z.ZodTypeAny = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "key": z.string().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "rule_id": z.number().optional(), "table_id": z.number().optional(), "type": z.string().optional() }).strict())
|
|
38
38
|
|
|
39
39
|
export const AppIngressBulkApplyReqVOSchema: z.ZodTypeAny = z.lazy(() => z.object({ "dry_run": z.boolean().optional(), "items": z.array(AppIngressBulkApplyItemVOSchema).optional(), "mode": z.string().optional() }).strict())
|
|
40
40
|
|
|
41
|
-
export const AppIngressCreateReqVOSchema: z.ZodTypeAny = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "entity_id": z.number().optional(), "icon_name": z.string().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "type": z.string().optional(), "url": z.string().optional() }).strict())
|
|
41
|
+
export const AppIngressCreateReqVOSchema: z.ZodTypeAny = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "entity_id": z.number().optional(), "icon_name": z.string().optional(), "key": z.string().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "type": z.string().optional(), "url": z.string().optional() }).strict())
|
|
42
42
|
|
|
43
|
-
export const AppIngressUpdateReqVOSchema: z.ZodTypeAny = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "update": z.array(z.string()).optional() }).strict())
|
|
43
|
+
export const AppIngressUpdateReqVOSchema: z.ZodTypeAny = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "key": z.string().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "update": z.array(z.string()).optional() }).strict())
|
|
44
44
|
|
|
45
45
|
export const WidgetsTypeCodeSchema: z.ZodTypeAny = z.lazy(() => z.union([z.literal(1), z.literal(2)]))
|
|
46
46
|
|
package/sdk-dist/types/common.ts
CHANGED
|
@@ -23,7 +23,9 @@ export interface EntityIngress {
|
|
|
23
23
|
app_id?: number;
|
|
24
24
|
enabled?: boolean;
|
|
25
25
|
entity_id?: number;
|
|
26
|
+
hash_id?: string;
|
|
26
27
|
icon_name?: string;
|
|
28
|
+
key?: string;
|
|
27
29
|
last_modified_by?: number;
|
|
28
30
|
menu_group_id?: number;
|
|
29
31
|
mode?: string;
|
|
@@ -64,6 +66,7 @@ export interface AppIngressBulkApplyItemRespVO {
|
|
|
64
66
|
|
|
65
67
|
export interface AppIngressBulkApplyItemVO {
|
|
66
68
|
enabled?: boolean;
|
|
69
|
+
key?: string;
|
|
67
70
|
name?: string;
|
|
68
71
|
options?: EntityIngressOptions;
|
|
69
72
|
rule_id?: number;
|
|
@@ -88,6 +91,7 @@ export interface AppIngressCreateReqVO {
|
|
|
88
91
|
enabled?: boolean;
|
|
89
92
|
entity_id?: number;
|
|
90
93
|
icon_name?: string;
|
|
94
|
+
key?: string;
|
|
91
95
|
name?: string;
|
|
92
96
|
options?: EntityIngressOptions;
|
|
93
97
|
type?: string;
|
|
@@ -99,8 +103,10 @@ export interface AppIngressCreateRespVO {
|
|
|
99
103
|
created_at?: number;
|
|
100
104
|
enabled?: boolean;
|
|
101
105
|
entity_id?: number;
|
|
106
|
+
hash_id?: string;
|
|
102
107
|
icon_name?: string;
|
|
103
108
|
id?: number;
|
|
109
|
+
key?: string;
|
|
104
110
|
last_modified_by?: number;
|
|
105
111
|
menu_group_id?: number;
|
|
106
112
|
mode?: string;
|
|
@@ -117,8 +123,10 @@ export interface AppIngressDeleteRespVO {
|
|
|
117
123
|
created_at?: number;
|
|
118
124
|
enabled?: boolean;
|
|
119
125
|
entity_id?: number;
|
|
126
|
+
hash_id?: string;
|
|
120
127
|
icon_name?: string;
|
|
121
128
|
id?: number;
|
|
129
|
+
key?: string;
|
|
122
130
|
last_modified_by?: number;
|
|
123
131
|
menu_group_id?: number;
|
|
124
132
|
mode?: string;
|
|
@@ -135,8 +143,10 @@ export interface AppIngressGetByHashIDRespVO {
|
|
|
135
143
|
created_at?: number;
|
|
136
144
|
enabled?: boolean;
|
|
137
145
|
entity_id?: number;
|
|
146
|
+
hash_id?: string;
|
|
138
147
|
icon_name?: string;
|
|
139
148
|
id?: number;
|
|
149
|
+
key?: string;
|
|
140
150
|
last_modified_by?: number;
|
|
141
151
|
menu_group_id?: number;
|
|
142
152
|
mode?: string;
|
|
@@ -153,8 +163,10 @@ export interface AppIngressGetRespVO {
|
|
|
153
163
|
created_at?: number;
|
|
154
164
|
enabled?: boolean;
|
|
155
165
|
entity_id?: number;
|
|
166
|
+
hash_id?: string;
|
|
156
167
|
icon_name?: string;
|
|
157
168
|
id?: number;
|
|
169
|
+
key?: string;
|
|
158
170
|
last_modified_by?: number;
|
|
159
171
|
menu_group_id?: number;
|
|
160
172
|
mode?: string;
|
|
@@ -176,6 +188,7 @@ export interface AppIngressUpdateBlocksRespVO {
|
|
|
176
188
|
|
|
177
189
|
export interface AppIngressUpdateReqVO {
|
|
178
190
|
enabled?: boolean;
|
|
191
|
+
key?: string;
|
|
179
192
|
name?: string;
|
|
180
193
|
options?: EntityIngressOptions;
|
|
181
194
|
update?: string[];
|
|
@@ -186,8 +199,10 @@ export interface AppIngressUpdateRespVO {
|
|
|
186
199
|
created_at?: number;
|
|
187
200
|
enabled?: boolean;
|
|
188
201
|
entity_id?: number;
|
|
202
|
+
hash_id?: string;
|
|
189
203
|
icon_name?: string;
|
|
190
204
|
id?: number;
|
|
205
|
+
key?: string;
|
|
191
206
|
last_modified_by?: number;
|
|
192
207
|
menu_group_id?: number;
|
|
193
208
|
mode?: string;
|
|
@@ -34,13 +34,13 @@ export const PermitUserScopeSchema: z.ZodTypeAny = z.lazy(() => z.object({ "data
|
|
|
34
34
|
|
|
35
35
|
export const EntityIngressOptionsSchema: z.ZodTypeAny = z.lazy(() => z.object({ "i18n_name": I18NTextSchema.optional(), "list_options": PermitEntityListOptionsSchema.optional(), "policy": PermitPolicySchema.optional(), "user_scope": z.array(PermitUserScopeSchema).optional() }).strict())
|
|
36
36
|
|
|
37
|
-
export const AppIngressBulkApplyItemVOSchema: z.ZodTypeAny = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "rule_id": z.number().optional(), "table_id": z.number().optional(), "type": z.string().optional() }).strict())
|
|
37
|
+
export const AppIngressBulkApplyItemVOSchema: z.ZodTypeAny = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "key": z.string().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "rule_id": z.number().optional(), "table_id": z.number().optional(), "type": z.string().optional() }).strict())
|
|
38
38
|
|
|
39
39
|
export const AppIngressBulkApplyReqVOSchema: z.ZodTypeAny = z.lazy(() => z.object({ "dry_run": z.boolean().optional(), "items": z.array(AppIngressBulkApplyItemVOSchema).optional(), "mode": z.string().optional() }).strict())
|
|
40
40
|
|
|
41
|
-
export const AppIngressCreateReqVOSchema: z.ZodTypeAny = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "entity_id": z.number().optional(), "icon_name": z.string().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "type": z.string().optional(), "url": z.string().optional() }).strict())
|
|
41
|
+
export const AppIngressCreateReqVOSchema: z.ZodTypeAny = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "entity_id": z.number().optional(), "icon_name": z.string().optional(), "key": z.string().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "type": z.string().optional(), "url": z.string().optional() }).strict())
|
|
42
42
|
|
|
43
|
-
export const AppIngressUpdateReqVOSchema: z.ZodTypeAny = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "update": z.array(z.string()).optional() }).strict())
|
|
43
|
+
export const AppIngressUpdateReqVOSchema: z.ZodTypeAny = z.lazy(() => z.object({ "enabled": z.boolean().optional(), "key": z.string().optional(), "name": z.string().optional(), "options": EntityIngressOptionsSchema.optional(), "update": z.array(z.string()).optional() }).strict())
|
|
44
44
|
|
|
45
45
|
export const WidgetsTypeCodeSchema: z.ZodTypeAny = z.lazy(() => z.union([z.literal(1), z.literal(2)]))
|
|
46
46
|
|
package/src/runtime/execute.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import fs from 'fs'
|
|
2
2
|
import path from 'path'
|
|
3
|
+
import { ArcubaseCodeGenError, generateArcubaseProjectSDK } from '@arcubase/code-gen'
|
|
3
4
|
import { parseCLIArgs, hasFlag, flagValue } from './argv.js'
|
|
4
5
|
import { loadRuntimeEnv, type RuntimeEnv } from './env.js'
|
|
5
6
|
import { CLIError, type CLIErrorDetails } from './errors.js'
|
|
@@ -11,7 +12,6 @@ import { resolveArcubaseSDKPath } from './paths.js'
|
|
|
11
12
|
import { compileCSVImportMapping, compileExcelImportMapping, type CompiledEntityImportConfig } from './entity_import_mapping.js'
|
|
12
13
|
import { uploadLocalFileWithToken } from './local_upload.js'
|
|
13
14
|
import { renderCommandHelpExamples } from './help_examples.js'
|
|
14
|
-
import { generateArcubaseProjectSDK } from './dev_sdk_gen.js'
|
|
15
15
|
|
|
16
16
|
export type CommandExecutionSummary = {
|
|
17
17
|
scope: CommandScope
|
|
@@ -295,10 +295,10 @@ function renderDevSDKGenHelp(): string {
|
|
|
295
295
|
' - arcubase-admin dev sdk-gen --app-id <app_id> --out src/arcubase',
|
|
296
296
|
'',
|
|
297
297
|
'requirements:',
|
|
298
|
+
' - every generated ingress must have a configured ingress.key; sdk-gen fails fast when keys are missing',
|
|
298
299
|
' - every generated field must have a configured field.key; sdk-gen fails fast when keys are missing',
|
|
299
|
-
' -
|
|
300
|
-
' -
|
|
301
|
-
' - generated code accepts createArcubaseSdk({ baseURL, accessToken, refreshToken })',
|
|
300
|
+
' - ingress.key and field.key values must be stable unique TypeScript identifiers',
|
|
301
|
+
' - generated code accepts createArcubaseClient({ baseURL, accessToken, refreshToken }).ingress("<IngressKey>")',
|
|
302
302
|
].join('\n')
|
|
303
303
|
}
|
|
304
304
|
|
|
@@ -2006,6 +2006,8 @@ type SDKGenEntityRef = {
|
|
|
2006
2006
|
id: string
|
|
2007
2007
|
}
|
|
2008
2008
|
|
|
2009
|
+
type SDKGenIngressRef = Record<string, any>
|
|
2010
|
+
|
|
2009
2011
|
function extractSDKGenAppPayload(payload: unknown): Record<string, any> {
|
|
2010
2012
|
const appPayload = unwrapResponseData(payload)
|
|
2011
2013
|
if (!isRecord(appPayload)) {
|
|
@@ -2085,6 +2087,96 @@ function assertSDKGenFieldKeysPresent(entity: Record<string, any>) {
|
|
|
2085
2087
|
})
|
|
2086
2088
|
}
|
|
2087
2089
|
|
|
2090
|
+
function extractSDKGenIngressRefs(payload: unknown): SDKGenIngressRef[] {
|
|
2091
|
+
const data = unwrapResponseData(payload)
|
|
2092
|
+
const source = Array.isArray(data)
|
|
2093
|
+
? data
|
|
2094
|
+
: isRecord(data) && Array.isArray(data.list)
|
|
2095
|
+
? data.list
|
|
2096
|
+
: []
|
|
2097
|
+
return source.filter((item): item is SDKGenIngressRef => isRecord(item))
|
|
2098
|
+
}
|
|
2099
|
+
|
|
2100
|
+
function ingressKeyOf(ingress: Record<string, any>): string {
|
|
2101
|
+
return typeof ingress.key === 'string' ? ingress.key.trim() : ''
|
|
2102
|
+
}
|
|
2103
|
+
|
|
2104
|
+
function ingressHashIDOf(ingress: Record<string, any>): string {
|
|
2105
|
+
if (typeof ingress.hash_id === 'string' && ingress.hash_id.trim()) {
|
|
2106
|
+
return ingress.hash_id.trim()
|
|
2107
|
+
}
|
|
2108
|
+
if (typeof ingress.hashId === 'string' && ingress.hashId.trim()) {
|
|
2109
|
+
return ingress.hashId.trim()
|
|
2110
|
+
}
|
|
2111
|
+
return ''
|
|
2112
|
+
}
|
|
2113
|
+
|
|
2114
|
+
function assertSDKGenIngressesReady(ingresses: SDKGenIngressRef[]) {
|
|
2115
|
+
if (ingresses.length === 0) {
|
|
2116
|
+
throw new CLIError('SDK_GEN_NO_INGRESSES', 'sdk-gen could not find ingress definitions for this app', 2, {
|
|
2117
|
+
operation: 'dev sdk-gen',
|
|
2118
|
+
suggestions: ['create at least one access rule with a stable ingress.key before running sdk-gen'],
|
|
2119
|
+
})
|
|
2120
|
+
}
|
|
2121
|
+
|
|
2122
|
+
const seen = new Set<string>()
|
|
2123
|
+
const missingKey: SDKGenIngressRef[] = []
|
|
2124
|
+
const missingHash: SDKGenIngressRef[] = []
|
|
2125
|
+
const invalidKey: string[] = []
|
|
2126
|
+
const duplicateKey: string[] = []
|
|
2127
|
+
|
|
2128
|
+
for (const ingress of ingresses) {
|
|
2129
|
+
const key = ingressKeyOf(ingress)
|
|
2130
|
+
if (!key) {
|
|
2131
|
+
missingKey.push(ingress)
|
|
2132
|
+
continue
|
|
2133
|
+
}
|
|
2134
|
+
if (!/^[A-Za-z][A-Za-z0-9_]*$/.test(key)) {
|
|
2135
|
+
invalidKey.push(key)
|
|
2136
|
+
}
|
|
2137
|
+
if (seen.has(key)) {
|
|
2138
|
+
duplicateKey.push(key)
|
|
2139
|
+
}
|
|
2140
|
+
seen.add(key)
|
|
2141
|
+
if (!ingressHashIDOf(ingress)) {
|
|
2142
|
+
missingHash.push(ingress)
|
|
2143
|
+
}
|
|
2144
|
+
}
|
|
2145
|
+
|
|
2146
|
+
if (missingKey.length > 0) {
|
|
2147
|
+
const preview = missingKey.slice(0, 8).map((ingress) => String(ingress.name ?? ingress.id ?? 'unnamed ingress'))
|
|
2148
|
+
const suffix = missingKey.length > preview.length ? `, and ${missingKey.length - preview.length} more` : ''
|
|
2149
|
+
throw new CLIError('SDK_GEN_INGRESS_KEY_REQUIRED', `missing ingress.key values: ${preview.join(', ')}${suffix}`, 2, {
|
|
2150
|
+
operation: 'dev sdk-gen',
|
|
2151
|
+
issues: missingKey.map((ingress) => ({
|
|
2152
|
+
path: `ingress.${String(ingress.id ?? 'unknown')}.key`,
|
|
2153
|
+
message: `ingress.key is required for ${String(ingress.name ?? ingress.id ?? 'unnamed ingress')}`,
|
|
2154
|
+
})),
|
|
2155
|
+
suggestions: [
|
|
2156
|
+
'set stable ingress.key values in Arcubase admin before running sdk-gen',
|
|
2157
|
+
'rerun arcubase-admin dev sdk-gen after ingress keys are complete',
|
|
2158
|
+
],
|
|
2159
|
+
})
|
|
2160
|
+
}
|
|
2161
|
+
if (invalidKey.length > 0) {
|
|
2162
|
+
throw new CLIError('SDK_GEN_INVALID_INGRESS_KEY', `invalid ingress.key values: ${invalidKey.join(', ')}`, 2, {
|
|
2163
|
+
operation: 'dev sdk-gen',
|
|
2164
|
+
suggestions: ['use TypeScript identifier keys such as publicEntry or customerPortal'],
|
|
2165
|
+
})
|
|
2166
|
+
}
|
|
2167
|
+
if (duplicateKey.length > 0) {
|
|
2168
|
+
throw new CLIError('SDK_GEN_DUPLICATE_INGRESS_KEY', `duplicate ingress.key values: ${duplicateKey.join(', ')}`, 2, {
|
|
2169
|
+
operation: 'dev sdk-gen',
|
|
2170
|
+
})
|
|
2171
|
+
}
|
|
2172
|
+
if (missingHash.length > 0) {
|
|
2173
|
+
throw new CLIError('SDK_GEN_INGRESS_HASH_ID_REQUIRED', 'sdk-gen expected hash_id for every ingress definition', 2, {
|
|
2174
|
+
operation: 'dev sdk-gen',
|
|
2175
|
+
suggestions: ['upgrade Arcubase server so admin access-rule list returns hash_id'],
|
|
2176
|
+
})
|
|
2177
|
+
}
|
|
2178
|
+
}
|
|
2179
|
+
|
|
2088
2180
|
async function executeDevSDKGen(
|
|
2089
2181
|
runtimeEnv: RuntimeEnv,
|
|
2090
2182
|
flags: Record<string, string | boolean>,
|
|
@@ -2116,7 +2208,7 @@ async function executeDevSDKGen(
|
|
|
2116
2208
|
if (entityRefs.length === 0) {
|
|
2117
2209
|
throw new CLIError('SDK_GEN_NO_ENTITIES', 'sdk-gen could not find entities in app detail response', 2)
|
|
2118
2210
|
}
|
|
2119
|
-
const
|
|
2211
|
+
const ingresses: SDKGenIngressRef[] = []
|
|
2120
2212
|
for (const entityRef of entityRefs) {
|
|
2121
2213
|
const entityEndpoint = `/api/apps/${encodeURIComponent(appId)}/entity/${encodeURIComponent(entityRef.id)}`
|
|
2122
2214
|
const entityDetail = await requestJSON(runtimeEnv, 'GET', entityEndpoint, undefined, fetchImpl)
|
|
@@ -2125,13 +2217,36 @@ async function executeDevSDKGen(
|
|
|
2125
2217
|
throw new CLIError('SDK_GEN_INVALID_SCHEMA', 'sdk-gen expected entity detail response data', 2)
|
|
2126
2218
|
}
|
|
2127
2219
|
assertSDKGenFieldKeysPresent(entityPayload)
|
|
2128
|
-
|
|
2220
|
+
const ingressEndpoint = `/api/apps/${encodeURIComponent(appId)}/entity/${encodeURIComponent(entityRef.id)}/ingress`
|
|
2221
|
+
const ingressList = await requestJSON(runtimeEnv, 'GET', ingressEndpoint, undefined, fetchImpl)
|
|
2222
|
+
const entityIngresses = extractSDKGenIngressRefs(ingressList.data).map((ingress) => ({
|
|
2223
|
+
...ingress,
|
|
2224
|
+
hash_id: ingressHashIDOf(ingress),
|
|
2225
|
+
key: ingressKeyOf(ingress),
|
|
2226
|
+
entity: entityPayload,
|
|
2227
|
+
}))
|
|
2228
|
+
ingresses.push(...entityIngresses)
|
|
2229
|
+
}
|
|
2230
|
+
assertSDKGenIngressesReady(ingresses)
|
|
2231
|
+
let generated
|
|
2232
|
+
try {
|
|
2233
|
+
generated = generateArcubaseProjectSDK({
|
|
2234
|
+
id: resolveSDKGenAppId(appId, appPayload),
|
|
2235
|
+
name: typeof appPayload.name === 'string' ? appPayload.name : undefined,
|
|
2236
|
+
ingresses,
|
|
2237
|
+
})
|
|
2238
|
+
} catch (error) {
|
|
2239
|
+
if (error instanceof ArcubaseCodeGenError) {
|
|
2240
|
+
throw new CLIError(error.code, error.message, 2, {
|
|
2241
|
+
operation: 'dev sdk-gen',
|
|
2242
|
+
suggestions: [
|
|
2243
|
+
'set stable ingress.key and field.key values in Arcubase admin before running sdk-gen',
|
|
2244
|
+
'rerun arcubase-admin dev sdk-gen after schema keys are complete',
|
|
2245
|
+
],
|
|
2246
|
+
})
|
|
2247
|
+
}
|
|
2248
|
+
throw error
|
|
2129
2249
|
}
|
|
2130
|
-
const generated = generateArcubaseProjectSDK({
|
|
2131
|
-
id: resolveSDKGenAppId(appId, appPayload),
|
|
2132
|
-
name: typeof appPayload.name === 'string' ? appPayload.name : undefined,
|
|
2133
|
-
entities,
|
|
2134
|
-
})
|
|
2135
2250
|
const absoluteOutDir = path.resolve(process.cwd(), outDir)
|
|
2136
2251
|
|
|
2137
2252
|
for (const file of generated.files) {
|