@strapi/typescript-utils 0.0.0-next.dff425769af4d4d006725a10c395f59637403653 → 0.0.0-next.e09d30edcbd16960a838997778a31d50e9c60bc4

package/lib/__tests__/generators/schemas/utils.test.js

@@ -4,71 +4,18 @@ const ts = require('typescript');
 const { factory } = require('typescript');
 
 const {
-  getAllStrapiSchemas,
   getDefinitionAttributesCount,
   getSchemaExtendsTypeName,
   getSchemaInterfaceName,
   getSchemaModelType,
   getTypeNode,
   toTypeLiteral,
-} = require('../../../generators/schemas/utils');
+} = require('../../../generators/common/models/utils');
 
 describe('Utils', () => {
-  describe('Get All Strapi Schemas', () => {
-    test('Get both components and content types', () => {
-      const strapi = {
-        contentTypes: {
-          ctA: {},
-          ctB: {},
-        },
-        components: {
-          comp1: {},
-          comp2: {},
-          comp3: {},
-        },
-      };
-
-      const schemas = getAllStrapiSchemas(strapi);
-
-      expect(schemas).toMatchObject({ ctA: {}, ctB: {}, comp1: {}, comp2: {}, comp3: {} });
-    });
-
-    test('Get only components if there is no content type', () => {
-      const strapi = {
-        contentTypes: {},
-
-        components: {
-          comp1: {},
-          comp2: {},
-          comp3: {},
-        },
-      };
-
-      const schemas = getAllStrapiSchemas(strapi);
-
-      expect(schemas).toMatchObject({ comp1: {}, comp2: {}, comp3: {} });
-    });
-
-    test('Get only content types if there is no component', () => {
-      const strapi = {
-        contentTypes: {
-          ctA: {},
-          ctB: {},
-        },
-
-        components: {},
-      };
-
-      const schemas = getAllStrapiSchemas(strapi);
-
-      expect(schemas).toMatchObject({ ctA: {}, ctB: {} });
-    });
-  });
-
   describe('Get Definition Attributes Count', () => {
     const createMainNode = (members = []) => {
       return factory.createInterfaceDeclaration(
-        undefined,
         undefined,
         factory.createIdentifier('Foo'),
         undefined,
@@ -79,7 +26,6 @@ describe('Utils', () => {
 
     const createPropertyDeclaration = (name, type) => {
       return factory.createPropertyDeclaration(
-        undefined,
         undefined,
         factory.createIdentifier(name),
         undefined,
@@ -174,10 +120,10 @@ describe('Utils', () => {
 
   describe('Get Schema Extends Type Name', () => {
     test.each([
-      [{ modelType: 'component', kind: null }, 'ComponentSchema'],
-      [{ modelType: 'contentType', kind: 'singleType' }, 'SingleTypeSchema'],
-      [{ modelType: 'contentType', kind: 'collectionType' }, 'CollectionTypeSchema'],
-      [{ modelType: 'invalidType', kind: 'foo' }, 'Schema'],
+      [{ modelType: 'component', kind: null }, 'Schema.Component'],
+      [{ modelType: 'contentType', kind: 'singleType' }, 'Schema.SingleType'],
+      [{ modelType: 'contentType', kind: 'collectionType' }, 'Schema.CollectionType'],
+      [{ modelType: 'invalidType', kind: 'foo' }, null],
     ])("Expect %p to generate %p as the base type for a schema's interface", (schema, expected) => {
       expect(getSchemaExtendsTypeName(schema)).toBe(expected);
     });

package/lib/admin/create-tsconfig-file.js

@@ -2,25 +2,11 @@
 
 const path = require('path');
 const fs = require('fs-extra');
+const adminTsConfig = require('../../tsconfigs/admin.json');
 
 module.exports = async (dest) => {
   const tsConfig = {
-    compilerOptions: {
-      lib: ['es2019', 'es2020.promise', 'es2020.bigint', 'es2020.string', 'DOM'],
-      noImplicitAny: false,
-      module: 'es2020',
-      target: 'es5',
-      jsx: 'react',
-      allowJs: true,
-      strict: true,
-      moduleResolution: 'node',
-      skipLibCheck: true,
-      esModuleInterop: true,
-      allowSyntheticDefaultImports: true,
-      resolveJsonModule: true,
-      noEmit: false,
-      incremental: true,
-    },
+    ...adminTsConfig,
     include: ['../../../src/admin/*', '../../../src/**/**/admin/src/*'],
     exclude: ['node_modules', '**/*.test.js', '*.js'],
   };

package/lib/compile.js

@@ -3,12 +3,8 @@
 const compilers = require('./compilers');
 const getConfigPath = require('./utils/get-config-path');
 
-module.exports = async (srcDir, { watch = false, configOptions = {} } = {}) => {
-  // TODO: Use the Strapi debug logger instead or don't log at all
-  console.log(`Starting the compilation for TypeScript files in ${srcDir}`);
-
-  const compiler = watch ? compilers.watch : compilers.basic;
+module.exports = async (srcDir, { configOptions = {} } = {}) => {
   const configPath = getConfigPath(srcDir);
 
-  compiler.run(configPath, configOptions);
+  compilers.basic.run(configPath, configOptions);
 };

package/lib/compilers/basic.js

@@ -13,15 +13,23 @@ module.exports = {
    * @param {Object} configOptions
    * @param {Array.<string>} configOptions.fileNames
    * @param {Object} configOptions.options
+   * @param {boolean} configOptions.ignoreDiagnostics
    */
   run(tsConfigPath, configOptions = {}) {
+    const { ignoreDiagnostics = false } = configOptions;
     // Parse the tsconfig.json file & resolve the configuration options
     const { fileNames, options, projectReferences } = resolveConfigOptions(tsConfigPath);
 
+    const compilerOptions = merge(options, configOptions.options);
+
+    if (ignoreDiagnostics) {
+      Object.assign(compilerOptions, { noEmit: false, noEmitOnError: false });
+    }
+
     const program = ts.createProgram({
       rootNames: configOptions.fileNames ? configOptions.fileNames : fileNames,
       projectReferences,
-      options: merge(options, configOptions.options),
+      options: compilerOptions,
     });
 
     const emitResults = program.emit();
@@ -30,12 +38,12 @@ module.exports = {
       ts.getPreEmitDiagnostics(program).concat(emitResults.diagnostics)
     );
 
-    if (diagnostics.length > 0) {
+    if (!ignoreDiagnostics && diagnostics.length > 0) {
       reportDiagnostics(diagnostics);
     }
 
-    // If the compilation failed, exit early
-    if (emitResults.emitSkipped) {
+    // If the compilation failed and diagnostics are not ignored, exit early
+    if (!ignoreDiagnostics && emitResults.emitSkipped) {
       process.exit(1);
     }
   },

package/lib/compilers/index.js

@@ -1,9 +1,7 @@
 'use strict';
 
 const basic = require('./basic');
-const watch = require('./watch');
 
 module.exports = {
   basic,
-  watch,
 };

package/lib/generators/{schemas → common}/imports.js

@@ -22,12 +22,13 @@ module.exports = {
       factory.createImportSpecifier(false, undefined, factory.createIdentifier(key))
     );
 
-    return factory.createImportDeclaration(
-      undefined,
-      undefined,
-      factory.createImportClause(false, undefined, factory.createNamedImports(formattedImports)),
-      factory.createStringLiteral('@strapi/strapi'),
-      undefined
-    );
+    return [
+      factory.createImportDeclaration(
+        undefined,
+        factory.createImportClause(true, undefined, factory.createNamedImports(formattedImports)),
+        factory.createStringLiteral('@strapi/strapi'),
+        undefined
+      ),
+    ];
   },
 };

package/lib/generators/common/index.js

@@ -0,0 +1,9 @@
+'use strict';
+
+const models = require('./models');
+const imports = require('./imports');
+
+module.exports = {
+  models,
+  imports,
+};

package/lib/generators/{schemas → common/models}/attributes.js

@@ -1,12 +1,14 @@
 'use strict';
 
-const { factory } = require('typescript');
+const ts = require('typescript');
 const _ = require('lodash/fp');
 
-const { addImport } = require('./imports');
-const { getTypeNode, toTypeLiteral } = require('./utils');
+const { addImport } = require('../imports');
+const { getTypeNode, toTypeLiteral, withAttributeNamespace, NAMESPACES } = require('./utils');
 const mappers = require('./mappers');
 
+const { factory } = ts;
+
 /**
  * Create the base type node for a given attribute
  *
@@ -26,7 +28,8 @@ const getAttributeType = (attributeName, attribute, uid) => {
 
   const [attributeType, typeParams] = mappers[attribute.type]({ uid, attribute, attributeName });
 
-  addImport(attributeType);
+  // Make sure the attribute namespace is imported
+  addImport(NAMESPACES.attribute);
 
   return getTypeNode(attributeType, typeParams);
 };
@@ -42,38 +45,36 @@ const getAttributeModifiers = (attribute) => {
 
   // Required
   if (attribute.required) {
-    addImport('RequiredAttribute');
-
-    modifiers.push(factory.createTypeReferenceNode(factory.createIdentifier('RequiredAttribute')));
+    modifiers.push(
+      factory.createTypeReferenceNode(factory.createIdentifier(withAttributeNamespace('Required')))
+    );
   }
 
   // Private
   if (attribute.private) {
-    addImport('PrivateAttribute');
-
-    modifiers.push(factory.createTypeReferenceNode(factory.createIdentifier('PrivateAttribute')));
+    modifiers.push(
+      factory.createTypeReferenceNode(factory.createIdentifier(withAttributeNamespace('Private')))
+    );
   }
 
   // Unique
   if (attribute.unique) {
-    addImport('UniqueAttribute');
-
-    modifiers.push(factory.createTypeReferenceNode(factory.createIdentifier('UniqueAttribute')));
+    modifiers.push(
+      factory.createTypeReferenceNode(factory.createIdentifier(withAttributeNamespace('Unique')))
+    );
   }
 
   // Configurable
   if (attribute.configurable) {
-    addImport('ConfigurableAttribute');
-
     modifiers.push(
-      factory.createTypeReferenceNode(factory.createIdentifier('ConfigurableAttribute'))
+      factory.createTypeReferenceNode(
+        factory.createIdentifier(withAttributeNamespace('Configurable'))
+      )
     );
   }
 
   // Custom field
   if (attribute.customField) {
-    addImport('CustomField');
-
     const customFieldUid = factory.createStringLiteral(attribute.customField);
     const typeArguments = [customFieldUid];
 
@@ -82,17 +83,18 @@ const getAttributeModifiers = (attribute) => {
     }
 
     modifiers.push(
-      factory.createTypeReferenceNode(factory.createIdentifier('CustomField'), typeArguments)
+      factory.createTypeReferenceNode(
+        factory.createIdentifier(withAttributeNamespace('CustomField')),
+        typeArguments
+      )
     );
   }
 
   // Plugin Options
   if (!_.isEmpty(attribute.pluginOptions)) {
-    addImport('SetPluginOptions');
-
     modifiers.push(
       factory.createTypeReferenceNode(
-        factory.createIdentifier('SetPluginOptions'),
+        factory.createIdentifier(withAttributeNamespace('SetPluginOptions')),
         // Transform the pluginOptions object into an object literal expression
         [toTypeLiteral(attribute.pluginOptions)]
       )
@@ -100,40 +102,64 @@ const getAttributeModifiers = (attribute) => {
   }
 
   // Min / Max
-  // TODO: Always provide a second type argument for min/max (ie: resolve the attribute scalar type with a `GetAttributeType<${mappers[attribute][0]}>` (useful for biginter (string values)))
   if (!_.isNil(attribute.min) || !_.isNil(attribute.max)) {
-    addImport('SetMinMax');
-
     const minMaxProperties = _.pick(['min', 'max'], attribute);
+    const { min, max } = minMaxProperties;
+
+    const typeofMin = typeof min;
+    const typeofMax = typeof max;
+
+    // Throws error if min/max exist but have different types to prevent unexpected behavior
+    if (min !== undefined && max !== undefined && typeofMin !== typeofMax) {
+      throw new Error('typeof min/max values mismatch');
+    }
+
+    let typeKeyword;
+
+    // use 'string'
+    if (typeofMin === 'string' || typeofMax === 'string') {
+      typeKeyword = ts.SyntaxKind.StringKeyword;
+    }
+    // use 'number'
+    else if (typeofMin === 'number' || typeofMax === 'number') {
+      typeKeyword = ts.SyntaxKind.NumberKeyword;
+    }
+    // invalid type
+    else {
+      throw new Error(
+        `Invalid data type for min/max options. Must be string, number or undefined, but found { min: ${min} (${typeofMin}), max: ${max} (${typeofMax}) }`
+      );
+    }
 
     modifiers.push(
-      factory.createTypeReferenceNode(factory.createIdentifier('SetMinMax'), [
-        toTypeLiteral(minMaxProperties),
-      ])
+      factory.createTypeReferenceNode(
+        factory.createIdentifier(withAttributeNamespace('SetMinMax')),
+        [toTypeLiteral(minMaxProperties), factory.createKeywordTypeNode(typeKeyword)]
+      )
     );
   }
 
   // Min length / Max length
   if (!_.isNil(attribute.minLength) || !_.isNil(attribute.maxLength)) {
-    addImport('SetMinMaxLength');
-
     const minMaxProperties = _.pick(['minLength', 'maxLength'], attribute);
 
     modifiers.push(
-      factory.createTypeReferenceNode(factory.createIdentifier('SetMinMaxLength'), [
-        toTypeLiteral(minMaxProperties),
-      ])
+      factory.createTypeReferenceNode(
+        factory.createIdentifier(withAttributeNamespace('SetMinMaxLength')),
+        [toTypeLiteral(minMaxProperties)]
+      )
     );
   }
 
   // Default
   if (!_.isNil(attribute.default)) {
-    addImport('DefaultTo');
-
     const defaultLiteral = toTypeLiteral(attribute.default);
 
     modifiers.push(
-      factory.createTypeReferenceNode(factory.createIdentifier('DefaultTo'), [defaultLiteral])
+      factory.createTypeReferenceNode(
+        factory.createIdentifier(withAttributeNamespace('DefaultTo')),
+        [defaultLiteral]
+      )
     );
   }
 

package/lib/generators/common/models/index.js

@@ -0,0 +1,15 @@
+'use strict';
+
+const schema = require('./schema');
+const attributes = require('./attributes');
+const mappers = require('./mappers');
+const utils = require('./utils');
+const imports = require('../imports');
+
+module.exports = {
+  schema,
+  attributes,
+  mappers,
+  utils,
+  imports,
+};

package/lib/generators/{schemas → common/models}/mappers.js

@@ -3,56 +3,56 @@
 const ts = require('typescript');
 const _ = require('lodash/fp');
 
-const { toTypeLiteral } = require('./utils');
+const { toTypeLiteral, withAttributeNamespace } = require('./utils');
 
 const { factory } = ts;
 
 module.exports = {
   string() {
-    return ['StringAttribute'];
+    return [withAttributeNamespace('String')];
   },
   text() {
-    return ['TextAttribute'];
+    return [withAttributeNamespace('Text')];
   },
   richtext() {
-    return ['RichTextAttribute'];
+    return [withAttributeNamespace('RichText')];
   },
   password() {
-    return ['PasswordAttribute'];
+    return [withAttributeNamespace('Password')];
   },
   email() {
-    return ['EmailAttribute'];
+    return [withAttributeNamespace('Email')];
   },
   date() {
-    return ['DateAttribute'];
+    return [withAttributeNamespace('Date')];
   },
   time() {
-    return ['TimeAttribute'];
+    return [withAttributeNamespace('Time')];
   },
   datetime() {
-    return ['DateTimeAttribute'];
+    return [withAttributeNamespace('DateTime')];
   },
   timestamp() {
-    return ['TimestampAttribute'];
+    return [withAttributeNamespace('Timestamp')];
   },
   integer() {
-    return ['IntegerAttribute'];
+    return [withAttributeNamespace('Integer')];
   },
   biginteger() {
-    return ['BigIntegerAttribute'];
+    return [withAttributeNamespace('BigInteger')];
   },
   float() {
-    return ['FloatAttribute'];
+    return [withAttributeNamespace('Float')];
   },
   decimal() {
-    return ['DecimalAttribute'];
+    return [withAttributeNamespace('Decimal')];
   },
   uid({ attribute, uid }) {
     const { targetField, options } = attribute;
 
     // If there are no params to compute, then return the attribute type alone
     if (targetField === undefined && options === undefined) {
-      return ['UIDAttribute'];
+      return [withAttributeNamespace('UID')];
     }
 
     const params = [];
@@ -74,21 +74,24 @@ module.exports = {
       params.push(toTypeLiteral(options));
     }
 
-    return ['UIDAttribute', params];
+    return [withAttributeNamespace('UID'), params];
   },
   enumeration({ attribute }) {
     const { enum: enumValues } = attribute;
 
-    return ['EnumerationAttribute', [toTypeLiteral(enumValues)]];
+    return [withAttributeNamespace('Enumeration'), [toTypeLiteral(enumValues)]];
   },
   boolean() {
-    return ['BooleanAttribute'];
+    return [withAttributeNamespace('Boolean')];
   },
   json() {
-    return ['JSONAttribute'];
+    return [withAttributeNamespace('JSON')];
+  },
+  blocks() {
+    return [withAttributeNamespace('Blocks')];
   },
   media() {
-    return ['MediaAttribute'];
+    return [withAttributeNamespace('Media')];
   },
   relation({ uid, attribute }) {
     const { relation, target } = attribute;
@@ -97,13 +100,13 @@ module.exports = {
 
     if (isMorphRelation) {
       return [
-        'RelationAttribute',
+        withAttributeNamespace('Relation'),
         [factory.createStringLiteral(uid, true), factory.createStringLiteral(relation, true)],
       ];
     }
 
     return [
-      'RelationAttribute',
+      withAttributeNamespace('Relation'),
       [
         factory.createStringLiteral(uid, true),
         factory.createStringLiteral(relation, true),
@@ -119,13 +122,13 @@ module.exports = {
       params.push(factory.createTrue());
     }
 
-    return ['ComponentAttribute', params];
+    return [withAttributeNamespace('Component'), params];
   },
   dynamiczone({ attribute }) {
     const componentsParam = factory.createTupleTypeNode(
       attribute.components.map((component) => factory.createStringLiteral(component))
     );
 
-    return ['DynamicZoneAttribute', [componentsParam]];
+    return [withAttributeNamespace('DynamicZone'), [componentsParam]];
   },
 };

package/lib/generators/{schemas → common/models}/schema.js

@@ -4,9 +4,14 @@ const ts = require('typescript');
 const { factory } = require('typescript');
 const { isEmpty } = require('lodash/fp');
 
-const { getSchemaExtendsTypeName, getSchemaInterfaceName, toTypeLiteral } = require('./utils');
+const {
+  getSchemaExtendsTypeName,
+  getSchemaInterfaceName,
+  toTypeLiteral,
+  NAMESPACES,
+} = require('./utils');
 const attributeToPropertySignature = require('./attributes');
-const { addImport } = require('./imports');
+const { addImport } = require('../imports');
 
 /**
  * Generate a property signature for the schema's `attributes` field
@@ -51,11 +56,11 @@ const generateSchemaDefinition = (schema) => {
   const interfaceName = getSchemaInterfaceName(uid);
   const parentType = getSchemaExtendsTypeName(schema);
 
-  // Make sure the extended interface are imported
-  addImport(parentType);
+  // Make sure the Schema namespace is imported
+  addImport(NAMESPACES.schema);
 
   // Properties whose values can be mapped to a literal type expression
-  const literalPropertiesDefinitions = ['info', 'options', 'pluginOptions']
+  const literalPropertiesDefinitions = ['collectionName', 'info', 'options', 'pluginOptions']
     // Ignore non-existent or empty declarations
     .filter((key) => !isEmpty(schema[key]))
     // Generate literal definition for each property
@@ -69,7 +74,6 @@ const generateSchemaDefinition = (schema) => {
 
   // Generate the schema's interface declaration
   const schemaType = factory.createInterfaceDeclaration(
-    undefined,
     [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
     factory.createIdentifier(interfaceName),
     undefined,

package/lib/generators/{schemas → common/models}/utils.js

@@ -17,13 +17,10 @@ const {
   propEq,
 } = require('lodash/fp');
 
-/**
- * Get all components and content-types in a Strapi application
- *
- * @param {Strapi} strapi
- * @returns {object}
- */
-const getAllStrapiSchemas = (strapi) => ({ ...strapi.contentTypes, ...strapi.components });
+const NAMESPACES = {
+  schema: 'Schema',
+  attribute: 'Attribute',
+};
 
 /**
  * Extract a valid interface name from a schema uid
@@ -58,7 +55,11 @@ const getSchemaModelType = (schema) => {
 const getSchemaExtendsTypeName = (schema) => {
   const base = getSchemaModelType(schema);
 
-  return `${upperFirst(base)}Schema`;
+  if (base === null) {
+    return null;
+  }
+
+  return `${NAMESPACES.schema}.${upperFirst(base)}`;
 };
 
 /**
@@ -120,13 +121,7 @@ const toTypeLiteral = (data) => {
 
     return [
       ...acc,
-      factory.createPropertyDeclaration(
-        undefined,
-        undefined,
-        identifier,
-        undefined,
-        toTypeLiteral(value)
-      ),
+      factory.createPropertyDeclaration(undefined, identifier, undefined, toTypeLiteral(value)),
     ];
   }, []);
 
@@ -149,8 +144,26 @@ const getDefinitionAttributesCount = (definition) => {
   return attributesNode.type.members.length;
 };
 
+/**
+ * Add the attribute namespace before the typename
+ *
+ * @param {string} typeName
+ * @returns {string}
+ */
+const withAttributeNamespace = (typeName) => `${NAMESPACES.attribute}.${typeName}`;
+
+/**
+ * Add the schema namespace before the typename
+ *
+ * @param {string} typeName
+ * @returns {string}
+ */
+const withSchemaNamespace = (typeName) => `${NAMESPACES.schema}.${typeName}`;
+
 module.exports = {
-  getAllStrapiSchemas,
+  NAMESPACES,
+  withAttributeNamespace,
+  withSchemaNamespace,
   getSchemaInterfaceName,
   getSchemaExtendsTypeName,
   getSchemaModelType,