@simitgroup/simpleapp-generator 1.0.46 → 1.0.48

package/dist/type.d.ts

@@ -1,4 +1,4 @@
-import { JSONSchema7, JSONSchema7Definition } from 'json-schema';
+import { JSONSchema7Type, JSONSchema7Version, JSONSchema7TypeName, JSONSchema7Definition } from 'json-schema';
 export type ChildModels = {
     [key: string]: {
         type: string;
@@ -51,6 +51,7 @@ export type ModuleObject = {
     docname: string;
     pagetype: string;
     api: DocumentApi[];
+    schema: SimpleAppJSONSchema7;
 };
 export type TypeGenerateDocumentVariable = {
     name: string;
@@ -64,7 +65,7 @@ export type TypeGenerateDocumentVariable = {
     typename: string;
     fullApiSchemaName: string;
     fullTypeName: string;
-    jsonschema: JSONSchema7;
+    jsonschema: SimpleAppJSONSchema7;
     bothEndCode: string;
     frontEndCode: string;
     backEndCode: string;
@@ -116,10 +117,6 @@ export declare enum IsolationType {
     "org" = "org",
     "branch" = "branch"
 }
-export type ImportLibs = {
-    "lib": string;
-    "as": string;
-};
 export type Formula = {
     "jsonpath": string;
     "formula": string;
@@ -135,30 +132,126 @@ export type SchemaConfig = {
     allStatus?: DocumentStatus[];
     additionalApis?: DocumentApi[];
     additionalAutoCompleteFields?: string[];
-    libs?: ImportLibs[];
     formulas?: Formula[];
     documentType: string;
     documentName: string;
     collectionName?: string;
     foreignKeys?: MyForeignKey;
 };
-export type ForeignKeyProperty = {
-    'x-foreignkey'?: string;
-};
 export type SchemaFields = {
-    _id: JSONSchema7;
-    tenantId: JSONSchema7 & ForeignKeyProperty;
-    orgId: JSONSchema7 & ForeignKeyProperty;
-    branchId: JSONSchema7 & ForeignKeyProperty;
-    created: JSONSchema7;
-    updated: JSONSchema7;
-    createdby: JSONSchema7;
-    updatedby: JSONSchema7;
-    [key: string]: JSONSchema7 & ForeignKeyProperty;
-};
-export type AdditionalSchemaType = {
+    _id: SimpleAppJSONSchema7;
+    tenantId: SimpleAppJSONSchema7;
+    orgId: SimpleAppJSONSchema7;
+    branchId: SimpleAppJSONSchema7;
+    created: SimpleAppJSONSchema7;
+    updated: SimpleAppJSONSchema7;
+    createdby: SimpleAppJSONSchema7;
+    updatedby: SimpleAppJSONSchema7;
+    [key: string]: SimpleAppJSONSchema7 | SimpleAppJSONSchema7[] | undefined;
+};
+export type SchemaType = {
+    type: string;
+    definitions?: SimpleAppJSONSchema7;
+    required?: string[];
     "x-simpleapp-config": SchemaConfig;
     properties: SchemaFields;
 };
-export type SchemaType = JSONSchema7 & AdditionalSchemaType;
+export type SimpleAppJSONSchema7Definition = SimpleAppJSONSchema7 | boolean;
+export interface SimpleAppJSONSchema7 {
+    'x-foreignkey'?: string;
+    $id?: string | undefined;
+    $ref?: string | undefined;
+    $schema?: JSONSchema7Version | undefined;
+    $comment?: string | undefined;
+    /**
+     * @see https://datatracker.ietf.org/doc/html/draft-bhutton-json-schema-00#section-8.2.4
+     * @see https://datatracker.ietf.org/doc/html/draft-bhutton-json-schema-validation-00#appendix-A
+     */
+    $defs?: {
+        [key: string]: JSONSchema7Definition;
+    } | undefined;
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.1
+     */
+    type?: JSONSchema7TypeName | JSONSchema7TypeName[] | undefined;
+    enum?: JSONSchema7Type[] | undefined;
+    const?: JSONSchema7Type | undefined;
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.2
+     */
+    multipleOf?: number | undefined;
+    maximum?: number | undefined;
+    exclusiveMaximum?: number | undefined;
+    minimum?: number | undefined;
+    exclusiveMinimum?: number | undefined;
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.3
+     */
+    maxLength?: number | undefined;
+    minLength?: number | undefined;
+    pattern?: string | undefined;
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.4
+     */
+    items?: SimpleAppJSONSchema7Definition | SimpleAppJSONSchema7Definition[] | undefined;
+    additionalItems?: JSONSchema7Definition | undefined;
+    maxItems?: number | undefined;
+    minItems?: number | undefined;
+    uniqueItems?: boolean | undefined;
+    contains?: SimpleAppJSONSchema7Definition | undefined;
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.5
+     */
+    maxProperties?: number | undefined;
+    minProperties?: number | undefined;
+    required?: string[] | undefined;
+    properties?: {
+        [key: string]: SimpleAppJSONSchema7Definition;
+    } | undefined;
+    patternProperties?: {
+        [key: string]: SimpleAppJSONSchema7Definition;
+    } | undefined;
+    additionalProperties?: SimpleAppJSONSchema7Definition | undefined;
+    dependencies?: {
+        [key: string]: SimpleAppJSONSchema7Definition | string[];
+    } | undefined;
+    propertyNames?: SimpleAppJSONSchema7Definition | undefined;
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.6
+     */
+    if?: SimpleAppJSONSchema7Definition | undefined;
+    then?: SimpleAppJSONSchema7Definition | undefined;
+    else?: SimpleAppJSONSchema7Definition | undefined;
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.7
+     */
+    allOf?: SimpleAppJSONSchema7Definition[] | undefined;
+    anyOf?: SimpleAppJSONSchema7Definition[] | undefined;
+    oneOf?: SimpleAppJSONSchema7Definition[] | undefined;
+    not?: SimpleAppJSONSchema7Definition | undefined;
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-7
+     */
+    format?: string | undefined;
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-8
+     */
+    contentMediaType?: string | undefined;
+    contentEncoding?: string | undefined;
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-9
+     */
+    definitions?: {
+        [key: string]: JSONSchema7Definition;
+    } | undefined;
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-10
+     */
+    title?: string | undefined;
+    description?: string | undefined;
+    default?: JSONSchema7Type | undefined;
+    readOnly?: boolean | undefined;
+    writeOnly?: boolean | undefined;
+    examples?: JSONSchema7Type | undefined;
+}
 //# sourceMappingURL=type.d.ts.map

package/dist/type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"AAAA,OAAQ,EAAc,eAAe,EAAC,kBAAkB,EAAE,mBAAmB,EAAC,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzH,MAAM,MAAM,WAAW,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,WAAW,CAAC;QACnB,SAAS,EAAC,MAAM,CAAC;QACjB,SAAS,EAAC,MAAM,CAAC;QACjB,gBAAgB,CAAC,EAAC,MAAM,EAAE,CAAC;QAC3B,iBAAiB,CAAC,EAAC,cAAc,EAAE,CAAC;QACpC,WAAW,CAAC,EAAC,WAAW,EAAE,CAAC;QAE3B,aAAa,EAAC,MAAM,CAAA;QACpB,YAAY,EAAC,OAAO,CAAC;QACrB,WAAW,EAAC,YAAY,CAAA;KACzB,CAAC;CACH,CAAC;AACF,oBAAY,UAAU;IACpB,QAAQ,WAAW;IACnB,QAAQ,WAAW;IACnB,OAAO,UAAU;IACjB,SAAS,YAAY;IACrB,SAAS,YAAY;IACrB,QAAQ,WAAW;CACpB;AACD,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,IAAI,EAAE,UAAU,CAAC;IAEjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,CAAC;AAMF,MAAM,MAAM,WAAW,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,UAAU,GAAG,WAAW,GAAG,WAAW,EAAE,CAAC;CAC7E,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAE;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAA;CAErC,CAAA;AAGD,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,cAAc,EAAC,MAAM,GAAE,MAAM,EAAE,CAAA;CACjC,CAAA;AAID,MAAM,MAAM,uBAAuB,GAAG;IACpC,CAAC,aAAa,EAAC,MAAM,GAAE,cAAc,CAAA;CACtC,CAAA;AACD,MAAM,MAAM,cAAc,GAAC;IACzB,CAAC,UAAU,EAAC,MAAM,GAAE,MAAM,EAAE,CAAA;CAC7B,CAAA;AACD,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAC,MAAM,CAAA;IACd,OAAO,EAAC,MAAM,CAAA;IACd,QAAQ,EAAC,MAAM,CAAA;IACf,GAAG,EAAC,WAAW,EAAE,CAAA;IACjB,MAAM,EAAC,oBAAoB,CAAA;CAC5B,CAAA;AACD,MAAM,MAAM,4BAA4B,GAAE;IAC1C,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,WAAW,CAAA;IACnB,gBAAgB,EAAC,MAAM,CAAA;IACvB,gBAAgB,EAAC,MAAM,CAAA;IACvB,gBAAgB,EAAC,MAAM,EAAE,CAAA;IACzB,MAAM,EAAE,WAAW,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,MAAM,CAAA;IAChB,iBAAiB,EAAE,MAAM,CAAA;IACzB,YAAY,EAAC,MAAM,CAAA;IACnB,UAAU,EAAE,oBAAoB,CAAA;IAChC,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAC,MAAM,CAAA;IACrB,aAAa,EAAC,MAAM,CAAA;IACpB,iBAAiB,EAAC,cAAc,EAAE,CAAC;IACnC,WAAW,EAAC,WAAW,EAAE,CAAC;IAC1B,aAAa,EAAC,MAAM,CAAA;IACpB,YAAY,EAAC,OAAO,CAAC;IACrB,WAAW,EAAE,YAAY,CAAA;CAExB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAC,MAAM,CAAC;IACf,OAAO,EAAC,MAAM,CAAC;IACf,QAAQ,EAAC,MAAM,CAAC;IAChB,WAAW,EAAC,MAAM,CAAC;IACnB,cAAc,EAAC,MAAM,CAAC;IACtB,kBAAkB,EAAC,MAAM,EAAE,CAAC;IAC5B,iBAAiB,EAAC,cAAc,EAAE,CAAC;IACnC,WAAW,EAAC,WAAW,EAAE,CAAC;IAE1B,aAAa,EAAC,MAAM,CAAA;IACpB,WAAW,EAAE,YAAY,CAAA;CAC1B,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAC,MAAM,CAAA;IACb,UAAU,EAAC,MAAM,CAAA;IACjB,QAAQ,EAAC,OAAO,CAAA;IAChB,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AACD,oBAAY,WAAW;IAAE,MAAM,SAAO;IAAC,KAAK,QAAM;IAAE,QAAQ,WAAS;IAAC,KAAK,QAAM;IAAE,OAAO,UAAQ;CAAC;AACnG,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAC,MAAM,CAAA;IACb,UAAU,EAAC,MAAM,CAAA;IACjB,SAAS,CAAC,EAAC,MAAM,EAAE,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,MAAM,EAAC,WAAW,CAAA;IAClB,OAAO,EAAC,MAAM,CAAC;IACf,WAAW,EAAC,MAAM,CAAA;CACnB,CAAA;AACD,oBAAY,aAAa;IAAE,MAAM,SAAO;IAAG,QAAQ,WAAS;IAAC,KAAK,QAAM;IAAE,QAAQ,WAAS;CAAC;AAE5F,MAAM,MAAM,OAAO,GAAI;IACrB,UAAU,EAAC,MAAM,CAAA;IACjB,SAAS,EAAC,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,aAAa,EAAE,aAAa,CAAA;IAC5B,aAAa,CAAC,EAAC,MAAM,EAAE,CAAA;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAC,MAAM,CAAA;IACjB,aAAa,CAAC,EAAC,MAAM,CAAA;IACrB,sBAAsB,CAAC,EAAC,OAAO,CAAA;IAC/B,YAAY,CAAC,EAAC,MAAM,CAAA;IACpB,SAAS,CAAC,EAAC,cAAc,EAAE,CAAA;IAC3B,cAAc,CAAC,EAAC,WAAW,EAAE,CAAA;IAC7B,4BAA6B,CAAC,EAAE,MAAM,EAAE,CAAA;IAExC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,CAAC,EAAC,YAAY,CAAC;CAC3B,CAAA;AAGD,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,oBAAoB,CAAA;IACzB,QAAQ,EAAE,oBAAoB,CAAA;IAC9B,KAAK,EAAE,oBAAoB,CAAA;IAC3B,QAAQ,EAAE,oBAAoB,CAAA;IAC9B,OAAO,EAAE,oBAAoB,CAAA;IAC7B,OAAO,EAAE,oBAAoB,CAAA;IAC7B,SAAS,EAAE,oBAAoB,CAAA;IAC/B,SAAS,EAAE,oBAAoB,CAAA;IAC/B,CAAC,GAAG,EAAC,MAAM,GAAE,oBAAoB,GAAG,oBAAoB,EAAE,GAAG,SAAS,CAAA;CAEvE,CAAA;AAGD,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAC,MAAM,CAAA;IACX,WAAW,CAAC,EAAC,oBAAoB,CAAA;IACjC,QAAQ,CAAC,EAAC,MAAM,EAAE,CAAA;IAElB,oBAAoB,EAAC,YAAY,CAAA;IACjC,UAAU,EAAG,YAAY,CAAA;CAC1B,CAAA;AAMD,MAAM,MAAM,8BAA8B,GAAG,oBAAoB,GAAG,OAAO,CAAC;AAC5E,MAAM,WAAW,oBAAoB;IAEnC,cAAe,CAAC,EAAC,MAAM,CAAA;IACrB,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,OAAO,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE9B;;;OAGG;IACH,KAAK,CAAC,EAAE;QACE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAC;KAC9C,GAAG,SAAS,CAAC;IAEd;;OAEG;IACH,IAAI,CAAC,EAAE,mBAAmB,GAAG,mBAAmB,EAAE,GAAG,SAAS,CAAC;IAC/D,IAAI,CAAC,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC;IACrC,KAAK,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;IAEpC;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEtC;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B;;OAEG;IACH,KAAK,CAAC,EAAE,8BAA8B,GAAG,8BAA8B,EAAE,GAAG,SAAS,CAAC;IACtF,eAAe,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IACpD,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,EAAE,8BAA8B,GAAG,SAAS,CAAC;IAEtD;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAChC,UAAU,CAAC,EAAE;QACT,CAAC,GAAG,EAAE,MAAM,GAAG,8BAA8B,CAAC;KACjD,GAAG,SAAS,CAAC;IACd,iBAAiB,CAAC,EAAE;QAChB,CAAC,GAAG,EAAE,MAAM,GAAG,8BAA8B,CAAC;KACjD,GAAG,SAAS,CAAC;IACd,oBAAoB,CAAC,EAAE,8BAA8B,GAAG,SAAS,CAAC;IAClE,YAAY,CAAC,EAAE;QACX,CAAC,GAAG,EAAE,MAAM,GAAG,8BAA8B,GAAG,MAAM,EAAE,CAAC;KAC5D,GAAG,SAAS,CAAC;IACd,aAAa,CAAC,EAAE,8BAA8B,GAAG,SAAS,CAAC;IAE3D;;OAEG;IACH,EAAE,CAAC,EAAE,8BAA8B,GAAG,SAAS,CAAC;IAChD,IAAI,CAAC,EAAE,8BAA8B,GAAG,SAAS,CAAC;IAClD,IAAI,CAAC,EAAE,8BAA8B,GAAG,SAAS,CAAC;IAElD;;OAEG;IACH,KAAK,CAAC,EAAE,8BAA8B,EAAE,GAAG,SAAS,CAAC;IACrD,KAAK,CAAC,EAAE,8BAA8B,EAAE,GAAG,SAAS,CAAC;IACrD,KAAK,CAAC,EAAE,8BAA8B,EAAE,GAAG,SAAS,CAAC;IACrD,GAAG,CAAC,EAAE,8BAA8B,GAAG,SAAS,CAAC;IAEjD;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC;;OAEG;IACH,WAAW,CAAC,EAAE;QACV,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAC;KACxC,GAAG,SAAS,CAAC;IAEd;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,OAAO,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAChC,QAAQ,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;CAC1C"}

package/dist/type.js.map

@@ -1 +1 @@
-{"version":3,"file":"type.js","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":";;;AAgBA,IAAY,UAOX;AAPD,WAAY,UAAU;IACpB,+BAAmB,CAAA;IACnB,+BAAmB,CAAA;IACnB,6BAAiB,CAAA;IACjB,iCAAqB,CAAA;IACrB,iCAAqB,CAAA;IACrB,+BAAmB,CAAA;AACrB,CAAC,EAPW,UAAU,0BAAV,UAAU,QAOrB;AA2FD,IAAY,WAAuF;AAAnG,WAAY,WAAW;IAAE,4BAAa,CAAA;IAAC,0BAAW,CAAA;IAAE,gCAAiB,CAAA;IAAC,0BAAW,CAAA;IAAE,8BAAe,CAAA;AAAA,CAAC,EAAvF,WAAW,2BAAX,WAAW,QAA4E;AAUnG,IAAY,aAAgF;AAA5F,WAAY,aAAa;IAAE,8BAAa,CAAA;IAAG,kCAAiB,CAAA;IAAC,4BAAW,CAAA;IAAE,kCAAiB,CAAA;AAAA,CAAC,EAAhF,aAAa,6BAAb,aAAa,QAAmE"}
+{"version":3,"file":"type.js","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":";;;AAgBA,IAAY,UAOX;AAPD,WAAY,UAAU;IACpB,+BAAmB,CAAA;IACnB,+BAAmB,CAAA;IACnB,6BAAiB,CAAA;IACjB,iCAAqB,CAAA;IACrB,iCAAqB,CAAA;IACrB,+BAAmB,CAAA;AACrB,CAAC,EAPW,UAAU,0BAAV,UAAU,QAOrB;AA4FD,IAAY,WAAuF;AAAnG,WAAY,WAAW;IAAE,4BAAa,CAAA;IAAC,0BAAW,CAAA;IAAE,gCAAiB,CAAA;IAAC,0BAAW,CAAA;IAAE,8BAAe,CAAA;AAAA,CAAC,EAAvF,WAAW,2BAAX,WAAW,QAA4E;AAUnG,IAAY,aAAgF;AAA5F,WAAY,aAAa;IAAE,8BAAa,CAAA;IAAG,kCAAiB,CAAA;IAAC,4BAAW,CAAA;IAAE,kCAAiB,CAAA;AAAA,CAAC,EAAhF,aAAa,6BAAb,aAAa,QAAmE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "1.0.46",
+  "version": "1.0.48",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema",
   "main": "dist/index.js",
   "scripts": {

package/src/buildinschemas/autoincreament.ts

@@ -5,7 +5,7 @@ export const autoincreament:SchemaType = {
     "x-simpleapp-config":{
       documentType:'autoinc',
       documentName:'autoincreament',
-      isolationType:IsolationType.tenant,
+      isolationType:IsolationType.none,
       pageType:"crud",      
       additionalApis:[{
         action:"genNextNumber",

package/src/buildinschemas/branch.ts

@@ -6,7 +6,7 @@ export const branch:SchemaType ={
         isolationType:IsolationType.tenant,
         documentType:'branch',
         documentName:'branch',
-        pageType:"crud", 
+        // pageType:"crud", 
         uniqueKey:'branchCode',
         documentTitle:'branchName',
         additionalAutoCompleteFields: ['branchId']

package/src/buildinschemas/docnoformat.ts

@@ -18,8 +18,7 @@ export const docnoformat:SchemaType ={
                 "execute":"listDocFormats",
                 "description":"get list of document format for 1 doctype"
               } ]
-        },
-        
+        },        
         properties: {
             _id:{type:'string'},
             created:{type:'string'},
@@ -29,30 +28,17 @@ export const docnoformat:SchemaType ={
             tenantId: {type:'integer',default:1,minimum:1 },
             orgId: {type:'integer',default:1,minimum:1 },
             branchId: {type:'integer',default:1,minimum:1 },
-          "docNoFormatNo": {"type": "string","examples": ["INV"]},
-          "docNoFormatName": { "type": "string", "examples": ["Invoice Default Format"]},
-          "active": {"type": "boolean","examples": [true],"default":true},
-          "default":{"type": "boolean","examples": [true],"default":true},
-          "docNoType": {"type": "string","examples": ["SI","PI"]},
-          "docNoPattern": {"type": "string","examples": ["SI{YYMM}-<000>","PI-2023-<0000>"],"description":"{date} format as ISO8601 symbol"},
-          "isMonthly": {"type": "boolean","examples": [false]},
-          "nextNumber":{"type":"integer","examples":[1],"default":1},
-          "monthlySetting": {
-            "type": "object",
-            "properties": {
-              "jan": {"type": "integer","default":1},
-              "feb": {"type": "integer","default":1},
-              "mar": {"type": "integer","default":1},
-              "apr": {"type": "integer","default":1},
-              "may": {"type": "integer","default":1},
-              "jun": {"type": "integer","default":1},
-              "jul": {"type": "integer","default":1},
-              "aug": {"type": "integer","default":1},
-              "sep": {"type": "integer","default":1},
-              "oct": {"type": "integer","default":1},
-              "nov": {"type": "integer","default":1},
-              "dec": {"type": "integer","default":1}
-            }
-          }
+            branch:{type:"object", "x-foreignkey":"branch",properties:{
+              "_id":{"type":"string"},
+              "label":{"type":"string"},
+              "branchId":{type:"integer"},
+            }},
+            docNoFormatNo: {"type": "string","examples": ["INV"]},
+            docNoFormatName: { "type": "string", "examples": ["Invoice Default Format"]},
+            active: {type: "boolean","examples": [true],default:true},
+            default:{type: "boolean","examples": [true],default:true},
+            docNoType: {type: "string","examples": ["SI","PI"]},
+            docNoPattern: {type: "string","examples": ["SI{YYMM}-<000>","PI-2023-<0000>"],"description":"{date} format as ISO8601 symbol"},          
+            nextNumber:{type:"integer",default:1}         
         }
       }

package/src/buildinschemas/user.ts

@@ -5,6 +5,7 @@ export const user:SchemaType ={
     "x-simpleapp-config":{
         documentType:'user',
         documentName:'user',
+        pageType:'crud',
         isolationType:IsolationType.tenant,
         uniqueKey:'email',
         documentTitle:'fullname',

package/src/framework.ts

@@ -12,7 +12,7 @@ let config = {
     "backendFolder":"./backend", 
     "groupFolder":"./groups",
     "backendPort":"8000",
-    "mongoConnectStr":'mongodb://user:pass@localhost:27017/simpleapp?authMechanism=DEFAULT',
+    "mongoConnectStr":'mongodb://localhost:27017/simpleapp',
     "frontendFolder":"./frontend",
     "frontendPort":"8080",
     "oauthSetting":{
@@ -126,6 +126,14 @@ export const prepareProject =  async (callback)=>{
             // log.info(fullfilename+"====>>"+tofilename)
             // console.log(txt)
             writeFileSync(tofilename,txt)            
+        }else if(filename.includes('._eta')){    
+            const tofilename =targetfolder + filename.replace('._eta','')        
+            log.info(tofilename,"Render file")
+            const txt = eta.render(fullfilename,vars)
+            if(!existsSync(tofilename)){
+                writeFileSync(tofilename,txt)            
+            }
+            
         }else if(filename.includes('.md')){
             const tofilename =dir + filename.replace('.eta','')        
             log.info(tofilename,"Copy")            
@@ -149,10 +157,10 @@ export const prepareNuxt = (callback:Function)=>{
     const targetfolder = config.frontendFolder
     if(!fs.existsSync(`${targetfolder}/.env`)){
         //asume no environment. prepare now
-        exec(`cd ${targetfolder};pnpm install;pnpm install -D @nuxtjs/tailwindcss @sidebase/nuxt-auth @nuxt/ui @types/node @vueuse/nuxt @sidebase/nuxt-auth @vueuse/core nuxt-security prettier `, (error, stdout, stderr)=>{                
+        exec(`cd ${targetfolder};pnpm install;pnpm install -D nuxt-primevue @nuxtjs/tailwindcss @sidebase/nuxt-auth @nuxt/ui @types/node @vueuse/nuxt @sidebase/nuxt-auth @vueuse/core  prettier `, (error, stdout, stderr)=>{                
             //;pnpm install    
             console.log(error, stdout, stderr)
-                exec(`cd ${targetfolder};pnpm install --save  pinia @pinia/nuxt @nuxt/kit lodash @types/lodash @darkwolf/base64url next-auth@4.21.1 @darkwolf/base64url @nuxt/ui ajv ajv-formats ajv-errors dotenv @fullcalendar/core @fullcalendar/vue3 quill primeflex primeicons prettier primevue axios json-schema mitt @simitgroup/simpleapp-vue-component@latest`, (error, stdout, stderr)=>{                
+                exec(`cd ${targetfolder};pnpm install --save  primeicons moment memory-cache jsonpath pinia @pinia/nuxt @nuxt/kit lodash @types/lodash @darkwolf/base64url next-auth@4.21.1 @darkwolf/base64url @nuxt/ui ajv ajv-formats ajv-errors dotenv @fullcalendar/core @fullcalendar/vue3 quill prettier axios json-schema mitt `, (error, stdout, stderr)=>{                
                 console.log(error, stdout, stderr)
                 
                 // fs.mkdirSync(`${targetfolder}/assets/css/`,{recursive:true})

package/src/generate.ts

@@ -12,14 +12,14 @@ import * as buildinschemas from './buildinschemas'
 import { JSONSchema7 } from 'json-schema';
 const { Eta } = require('eta');
 const { capitalizeFirstLetter }= require('./libs');
-const X_DOCUMENT_TYPE='x-document-type'
-const X_DOCUMENT_NAME='x-document-name'
-const X_COLLECTION_NAME='x-collection-name'
-const X_PAGE_TYPE='x-page-type'
-const extFb = '.xfb.json';
-const extHfb = '.xhfb.json';
-const extjsonschema = '.jsonschema.json';
-const extgroups = '.group.json';
+// const X_DOCUMENT_TYPE='x-document-type'
+// const X_DOCUMENT_NAME='x-document-name'
+// const X_COLLECTION_NAME='x-collection-name'
+const X_SIMPLEAPP_CONFIG='x-simpleapp-config'
+// const extFb = '.xfb.json';
+// const extHfb = '.xhfb.json';
+// const extjsonschema = '.jsonschema.json';
+// const extgroups = '.group.json';
 let jsonschemas = {};
 let configs:any = {}
 const docs = [];
@@ -92,15 +92,15 @@ export const run =  async (paraconfigs:any,genFor:string[],callback:Function) =>
     await processSchema(file.replace('.json',''),jsonschema)    
   }
   // //generate groups
-  // const systemgroups = readdirSync(`${groupFolder}`)
-  // for(let g = 0; g< systemgroups.length;g++){
-  //   const groupfile = systemgroups[g]
-  //   const groupjsonstr = readFileSync(`${groupFolder}/${groupfile}`, 'utf-8');      
-  //   const groupdata = JSON.parse(groupjsonstr);
-  //   const documentname = groupfile.split('.')[0]
-  //   const roles = prepareRoles(groupdata)
-  //   allroles[documentname]=roles
-  // }
+  const systemgroups = readdirSync(`${groupFolder}`)
+  for(let g = 0; g< systemgroups.length;g++){
+    const groupfile = systemgroups[g]
+    const groupjsonstr = readFileSync(`${groupFolder}/${groupfile}`, 'utf-8');      
+    const groupdata = JSON.parse(groupjsonstr);
+    const documentname = groupfile.split('.')[0]
+    const roles = prepareRoles(groupdata)
+    allroles[documentname]=roles
+  }
   finalize(activatemodules)
   callback()
 }
@@ -128,6 +128,7 @@ const processSchema= async (schemaname:string,jsondata:JSONSchema7)=>{
       // const jsondata = JSON.parse(jsonstring);    
       const  rendertype = 'basic';
       jsonschemas[docname] = jsondata;
+      const copyofjsonschema = {...jsondata}
       const allmodels:ChildModels =  await readJsonSchemaBuilder(docname, jsondata);
       // log.error("allmodels",docname,schemaname)
       generateSchema(docname, doctype, rendertype, allmodels);        
@@ -135,7 +136,8 @@ const processSchema= async (schemaname:string,jsondata:JSONSchema7)=>{
         doctype:doctype,
         docname:capitalizeFirstLetter(docname),
         pagetype: config.pageType??'',
-        api:config.additionalApis
+        api:config.additionalApis,
+        schema : copyofjsonschema
       })
     // } else {
       // log.warn(`Load `+clc.yellow(file) + ` but it is not supported`)
@@ -242,7 +244,7 @@ const generateSchema = ( docname: string,
         }else if(foldertype=='nuxt'){
           const capname = capitalizeFirstLetter(docname)
           const validateWritePage = (folder:string,isexists:boolean)=>{
-            if(!jsonschemas[docname][X_PAGE_TYPE] ){
+            if(!jsonschemas[docname][X_SIMPLEAPP_CONFIG]['pageType'] ){
               return false
             }else if(!isexists){
               return true
@@ -339,15 +341,26 @@ const finalize=(modules:ModuleObject[])=>{
         const arrfilename:string[] = filename.split('.')
         // log.info("check longfilename:::",longfilename,"become====",arrfilename)
         //only process .eta
-        if(_.last(arrfilename)=='eta'){                    
+        if(_.last(arrfilename)=='eta'|| _.last(arrfilename)=='_eta'){                    
           const relativepath = longfilename.includes('/') ? longfilename.replace(`/${filename}`,'') : ''
           const foldername = `${frameworkpath}/${relativepath}`
-          const shortfilename = filename.replace('.eta','')
+          const shortfilename = filename.replace('.eta','').replace('._eta','')
           const targetfilename = `${foldername}/${shortfilename}`
+          let forceoverride=true
+          if(filename.includes('._eta')){
+            forceoverride=false
+          }
+          // log.warn("Process=== ",targetfilename)
+          if(existsSync(targetfilename) &&  forceoverride == false){
+            log.info("file exists, skip: ",targetfilename)
+            continue;
+          }
+
+          
           if(!existsSync(foldername)){
             mkdirSync(foldername,{recursive:true})
           }
-          const templatename = `${frameworkfolder}/${longfilename}`.replace(".eta","")
+          // const templatename = `${frameworkfolder}/${longfilename}`.replace(".eta","").replace('._eta','')
           log.info("Write template:",targetfilename)
           const txt = eta.render(longfilename, renderProperties)
           writeFileSync(targetfilename,txt)

package/src/index.ts

@@ -82,7 +82,7 @@ if(continueexecute){
   const reGenFrontend = async()=>{
     fw.setConfiguration(configs)
     generate.run(configs,['nuxt'],()=>{
-      fw.prettyNuxt()                                      
+      // fw.prettyNuxt()                                      
     })  
   }
   const reGenBackend = async()=>{

package/src/processors/jsonschemabuilder.ts

@@ -3,7 +3,7 @@ import { JSONSchema7, JSONSchema7Definition,JSONSchema7Array,JSONSchema7TypeName
 import * as js7 from 'json-schema';
 import _ from 'lodash'
 import { capitalizeFirstLetter } from '../libs';
-import {SchemaType,SchemaConfig,JsonSchemaProperties,MyForeignKey} from "../type"
+import {SchemaType,SchemaConfig,JsonSchemaProperties} from "../type"
 // import * as schematemplates from '../schematype'
 import { Logger, ILogObj } from "tslog";
 import $RefParser from "@apidevtools/json-schema-ref-parser";
@@ -43,6 +43,7 @@ export const readJsonSchemaBuilder = async (docname: string,orijsondata:JSONSche
   
   let schemaconfigs:SchemaConfig = orijsondata[configname]
   const doctype=schemaconfigs.documentType
+
   if(!schemaconfigs.collectionName){
     schemaconfigs.documentName
   }
@@ -51,6 +52,18 @@ export const readJsonSchemaBuilder = async (docname: string,orijsondata:JSONSche
     schemaconfigs.foreignKeys={}
   }
 
+  if(schemaconfigs.generateDocumentNumber){
+    const tmp = {
+        type: "object",       
+        "x-foreignkey":"docnoformat", 
+        properties: {_id: {type: "string"},label: {type: "string"}}
+    }
+    orijsondata.properties["docNoFormat"] = tmp as JSONSchema7Definition
+  }
+
+  //apply some controls
+  //control docnoformatis required
+
   // let schemaprops:any = targettemplate.properties 
   // console.log("just want process targettemplate ######>>>",orijsondata)
   // let schemadefinitions = targettemplate.definitions