@sprucelabs/schema 32.3.7 → 32.3.8

package/build/esm/fields/RawField.js

@@ -14,7 +14,7 @@ class RawField extends AbstractField {
             resolvedType = `${arrayNotation}${goType}`;
         }
         else {
-            resolvedType = `${arrayNotation}${valueType}`;
+            resolvedType = `${valueType}${arrayNotation}`;
         }
         return {
             valueType: resolvedType,

package/build/esm/schemas.static.types.d.ts

@@ -28,7 +28,6 @@ export interface StaticSchemaEntity<S extends Schema> extends SchemaEntity {
     validate(options?: SchemaValidateOptions<S>): void;
     isValid(options?: SchemaValidateOptions<S>): boolean;
 }
-/** @ts-ignore */
 export type SchemaValues<S extends Schema, CreateEntityInstances extends boolean = false, IncludePrivateFields extends boolean = true, ShouldIncludeNullAndUndefinedFields extends boolean = false, F extends SchemaFieldNames<S> = SchemaFieldNames<S>, PF extends SchemaPublicFieldNames<S> = SchemaPublicFieldNames<S>> = IsDynamicSchema<S> extends true ? DynamicSchemaAllValues<S> : IncludePrivateFields extends false ? ShouldIncludeNullAndUndefinedFields extends true ? Pick<SchemaAllValues<S, CreateEntityInstances>, PF> : Pick<SchemaStaticValues<S, CreateEntityInstances>, PF> : ShouldIncludeNullAndUndefinedFields extends true ? Pick<SchemaAllValues<S, CreateEntityInstances>, F> : Pick<SchemaStaticValues<S, CreateEntityInstances>, F>;
 export interface DynamicSchemaEntityByName<ISchema extends Schema, OurField extends Field<any> = ISchema['dynamicFieldSignature'] extends FieldDefinitions ? FieldMap[ISchema['dynamicFieldSignature']['type']] : any> extends SchemaEntity, Omit<StaticSchemaEntity<ISchema>, 'get' | 'set' | 'getValues' | 'setValues' | 'getNamedFields' | 'schemaId' | 'namespace' | 'name' | 'version' | 'description'> {
     get<F extends string, CreateEntityInstances extends boolean = true>(fieldName: F, options?: DynamicSchemaNormalizeOptions<CreateEntityInstances>): FieldDefinitionValueType<OurField, CreateEntityInstances>;
@@ -48,7 +47,7 @@ export interface Schema {
     description?: string;
     importsWhenLocal?: string[];
     importsWhenRemote?: string[];
-    moduleToImportFromWhenRemote?: string;
+    moduleToImportFromWhenRemote?: string | SchemaImport;
     typeSuffix?: string;
     dynamicFieldSignature?: FieldDefinitions & {
         keyName: string;
@@ -56,6 +55,11 @@ export interface Schema {
     };
     fields?: SchemaFieldsByName;
 }
+export type SchemaSupportedLanguages = 'ts' | 'go';
+export interface SchemaImport {
+    language: SchemaSupportedLanguages;
+    module: string;
+}
 export interface SchemaFieldValueUnion<V extends Record<string, any> = Record<string, any>, Id extends string = string, Version extends string | undefined = undefined> {
     id: Id;
     version?: Version;

package/build/esm/types/template.types.d.ts

@@ -1,5 +1,5 @@
 import { FieldDefinitions } from '../fields';
-import { Schema } from '../schemas.static.types';
+import { Schema, SchemaSupportedLanguages } from '../schemas.static.types';
 export interface FieldTemplateDetails {
     /** The type literal of value (string, number) */
     valueType: string;
@@ -15,7 +15,7 @@ export declare enum TemplateRenderAs {
     /** We are rendering as the schema's field type (Schema) */
     SchemaType = "schemaType"
 }
-export type TemplateLanguage = 'ts' | 'go';
+export type TemplateLanguage = SchemaSupportedLanguages;
 /** The shape of options passed to AbstractField.generateTemplateDetails(options) */
 export interface FieldTemplateDetailOptions<T extends FieldDefinitions> {
     /** The language we're generating to, only TS for now */

package/build/fields/RawField.js

@@ -19,7 +19,7 @@ class RawField extends AbstractField_1.default {
             resolvedType = `${arrayNotation}${goType}`;
         }
         else {
-            resolvedType = `${arrayNotation}${valueType}`;
+            resolvedType = `${valueType}${arrayNotation}`;
         }
         return {
             valueType: resolvedType,

package/build/schemas.static.types.d.ts

@@ -28,7 +28,6 @@ export interface StaticSchemaEntity<S extends Schema> extends SchemaEntity {
     validate(options?: SchemaValidateOptions<S>): void;
     isValid(options?: SchemaValidateOptions<S>): boolean;
 }
-/** @ts-ignore */
 export type SchemaValues<S extends Schema, CreateEntityInstances extends boolean = false, IncludePrivateFields extends boolean = true, ShouldIncludeNullAndUndefinedFields extends boolean = false, F extends SchemaFieldNames<S> = SchemaFieldNames<S>, PF extends SchemaPublicFieldNames<S> = SchemaPublicFieldNames<S>> = IsDynamicSchema<S> extends true ? DynamicSchemaAllValues<S> : IncludePrivateFields extends false ? ShouldIncludeNullAndUndefinedFields extends true ? Pick<SchemaAllValues<S, CreateEntityInstances>, PF> : Pick<SchemaStaticValues<S, CreateEntityInstances>, PF> : ShouldIncludeNullAndUndefinedFields extends true ? Pick<SchemaAllValues<S, CreateEntityInstances>, F> : Pick<SchemaStaticValues<S, CreateEntityInstances>, F>;
 export interface DynamicSchemaEntityByName<ISchema extends Schema, OurField extends Field<any> = ISchema['dynamicFieldSignature'] extends FieldDefinitions ? FieldMap[ISchema['dynamicFieldSignature']['type']] : any> extends SchemaEntity, Omit<StaticSchemaEntity<ISchema>, 'get' | 'set' | 'getValues' | 'setValues' | 'getNamedFields' | 'schemaId' | 'namespace' | 'name' | 'version' | 'description'> {
     get<F extends string, CreateEntityInstances extends boolean = true>(fieldName: F, options?: DynamicSchemaNormalizeOptions<CreateEntityInstances>): FieldDefinitionValueType<OurField, CreateEntityInstances>;
@@ -48,7 +47,7 @@ export interface Schema {
     description?: string;
     importsWhenLocal?: string[];
     importsWhenRemote?: string[];
-    moduleToImportFromWhenRemote?: string;
+    moduleToImportFromWhenRemote?: string | SchemaImport;
     typeSuffix?: string;
     dynamicFieldSignature?: FieldDefinitions & {
         keyName: string;
@@ -56,6 +55,11 @@ export interface Schema {
     };
     fields?: SchemaFieldsByName;
 }
+export type SchemaSupportedLanguages = 'ts' | 'go';
+export interface SchemaImport {
+    language: SchemaSupportedLanguages;
+    module: string;
+}
 export interface SchemaFieldValueUnion<V extends Record<string, any> = Record<string, any>, Id extends string = string, Version extends string | undefined = undefined> {
     id: Id;
     version?: Version;

package/build/types/template.types.d.ts

@@ -1,5 +1,5 @@
 import { FieldDefinitions } from '../fields';
-import { Schema } from '../schemas.static.types';
+import { Schema, SchemaSupportedLanguages } from '../schemas.static.types';
 export interface FieldTemplateDetails {
     /** The type literal of value (string, number) */
     valueType: string;
@@ -15,7 +15,7 @@ export declare enum TemplateRenderAs {
     /** We are rendering as the schema's field type (Schema) */
     SchemaType = "schemaType"
 }
-export type TemplateLanguage = 'ts' | 'go';
+export type TemplateLanguage = SchemaSupportedLanguages;
 /** The shape of options passed to AbstractField.generateTemplateDetails(options) */
 export interface FieldTemplateDetailOptions<T extends FieldDefinitions> {
     /** The language we're generating to, only TS for now */

package/package.json

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