@sprucelabs/schema 32.3.3 → 32.3.5

package/build/SchemaTypesRenderer.d.ts

@@ -2,12 +2,14 @@ import { Schema } from './schemas.static.types';
 import { SchemaTemplateItem, TemplateLanguage } from './types/template.types';
 export default class SchemaTypesRenderer {
     static Renderer(): SchemaTypesRenderer;
-    render(schema: Schema, options: {
-        language: TemplateLanguage;
-        schemaTemplateItems: SchemaTemplateItem[];
-    }): string;
+    render(schema: Schema, options: RenderOptions): string;
     private renderName;
     private renderField;
     private renderComment;
     private ucFirst;
 }
+export interface RenderOptions {
+    language: TemplateLanguage;
+    schemaTemplateItems: SchemaTemplateItem[];
+    shouldPrefixNameWithNamespace?: boolean;
+}

package/build/SchemaTypesRenderer.js

@@ -12,9 +12,9 @@ class SchemaTypesRenderer {
     }
     render(schema, options) {
         (0, assertOptions_1.default)({ schema, options }, ['schema', 'options']);
-        const { id, fields, namespace } = schema;
+        const { id, fields } = schema;
         const { schemaTemplateItems } = options;
-        const name = this.renderName(id, namespace);
+        const name = this.renderName(id);
         const comment = this.renderComment(schema);
         let body = '';
         for (const [key, field] of Object.entries(fields ?? {})) {
@@ -24,8 +24,8 @@ class SchemaTypesRenderer {
         return `${comment ? `${comment}\n` : ''}type ${name} struct {
 ${body}}`;
     }
-    renderName(id, namespace) {
-        return `${namespace ? `${namespace}` : ''}${this.ucFirst(id)}`;
+    renderName(id) {
+        return this.ucFirst(id);
     }
     renderField(field, key, schemaTemplateItems = []) {
         const FieldClass = fields_1.fieldClassMap[field.type];

package/build/esm/SchemaTypesRenderer.d.ts

@@ -2,12 +2,14 @@ import { Schema } from './schemas.static.types';
 import { SchemaTemplateItem, TemplateLanguage } from './types/template.types';
 export default class SchemaTypesRenderer {
     static Renderer(): SchemaTypesRenderer;
-    render(schema: Schema, options: {
-        language: TemplateLanguage;
-        schemaTemplateItems: SchemaTemplateItem[];
-    }): string;
+    render(schema: Schema, options: RenderOptions): string;
     private renderName;
     private renderField;
     private renderComment;
     private ucFirst;
 }
+export interface RenderOptions {
+    language: TemplateLanguage;
+    schemaTemplateItems: SchemaTemplateItem[];
+    shouldPrefixNameWithNamespace?: boolean;
+}

package/build/esm/SchemaTypesRenderer.js

@@ -7,9 +7,9 @@ export default class SchemaTypesRenderer {
     }
     render(schema, options) {
         assertOptions({ schema, options }, ['schema', 'options']);
-        const { id, fields, namespace } = schema;
+        const { id, fields } = schema;
         const { schemaTemplateItems } = options;
-        const name = this.renderName(id, namespace);
+        const name = this.renderName(id);
         const comment = this.renderComment(schema);
         let body = '';
         for (const [key, field] of Object.entries(fields !== null && fields !== void 0 ? fields : {})) {
@@ -19,8 +19,8 @@ export default class SchemaTypesRenderer {
         return `${comment ? `${comment}\n` : ''}type ${name} struct {
 ${body}}`;
     }
-    renderName(id, namespace) {
-        return `${namespace ? `${namespace}` : ''}${this.ucFirst(id)}`;
+    renderName(id) {
+        return this.ucFirst(id);
     }
     renderField(field, key, schemaTemplateItems = []) {
         const FieldClass = fieldClassMap[field.type];

package/build/esm/fields/BooleanField.js

@@ -1,8 +1,18 @@
 import AbstractField from './AbstractField.js';
 class BooleanField extends AbstractField {
     static generateTemplateDetails(options) {
+        const { definition, language } = options;
+        const { isArray } = definition;
+        const arrayNotation = isArray ? '[]' : '';
+        let valueType = '';
+        if (language === 'go') {
+            valueType = `${arrayNotation}bool`;
+        }
+        else {
+            valueType = `boolean${arrayNotation}`;
+        }
         return {
-            valueType: `boolean${options.definition.isArray ? '[]' : ''}`,
+            valueType,
         };
     }
     /** * Turn everything into a string */

package/build/esm/fields/SchemaField.js

@@ -58,7 +58,7 @@ class SchemaField extends AbstractField {
             const { namePascal, namespace, id, nameCamel, schema } = this.findSchemaInTemplateItems(idWithVersion, templateItems);
             let valueType;
             if (language === 'go') {
-                valueType = `${namespace}${namePascal}`;
+                valueType = `${namePascal}`;
             }
             else if (renderAs === TemplateRenderAs.Value) {
                 valueType = `${nameCamel}Schema${schema.version ? `_${schema.version}` : ''}`;

package/build/fields/BooleanField.js

@@ -6,8 +6,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const AbstractField_1 = __importDefault(require("./AbstractField"));
 class BooleanField extends AbstractField_1.default {
     static generateTemplateDetails(options) {
+        const { definition, language } = options;
+        const { isArray } = definition;
+        const arrayNotation = isArray ? '[]' : '';
+        let valueType = '';
+        if (language === 'go') {
+            valueType = `${arrayNotation}bool`;
+        }
+        else {
+            valueType = `boolean${arrayNotation}`;
+        }
         return {
-            valueType: `boolean${options.definition.isArray ? '[]' : ''}`,
+            valueType,
         };
     }
     /** * Turn everything into a string */

package/build/fields/SchemaField.js

@@ -63,7 +63,7 @@ class SchemaField extends AbstractField_1.default {
             const { namePascal, namespace, id, nameCamel, schema } = this.findSchemaInTemplateItems(idWithVersion, templateItems);
             let valueType;
             if (language === 'go') {
-                valueType = `${namespace}${namePascal}`;
+                valueType = `${namePascal}`;
             }
             else if (renderAs === template_types_1.TemplateRenderAs.Value) {
                 valueType = `${nameCamel}Schema${schema.version ? `_${schema.version}` : ''}`;

package/package.json

@@ -8,7 +8,7 @@
     "!build/__tests__",
     "esm"
   ],
-  "version": "32.3.3",
+  "version": "32.3.5",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "module": "./build/esm/index.js",