quick fix - windows path sep

erikvullings · May 4, 2021 · a5f9e68 · a5f9e68
1 parent f8353ce
commit a5f9e68
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/src/test/test3.config.js b/src/test/test3.config.js
@@ -1,5 +1,5 @@
 const { interfaceName } = require('./test1.config');
-
+const path = require('path');
 /**
  * @type {import('../../index').IConfigOptions}
  */
@@ -12,20 +12,18 @@ const config = {
     inputGroup: 'src/test/components/content/',
     output: 'src/test/out3/',
     enum: true,
-    fieldType: (fieldType) => { if(fieldType === 'datetime') return 'string'},
+    fieldType: (fieldType) => { if (fieldType === 'datetime') return 'string' },
     // fieldName: (fieldName) => fieldName.replace('_', '-'),
     interfaceName: name => `X${name}`.replace(/ /g, ''),
-    outputFileName: (interfaceName, filename) => filename.indexOf('test/components/content/') !== -1 ? `content/${interfaceName}` : interfaceName,
-    enumName: (name, interfaceName) =>`Enum${interfaceName}${name}`,
+    outputFileName: (interfaceName, filename) => filename.indexOf(`test${path.sep}components${path.sep}content${path.sep}`) !== -1 ? `content${path.sep}${interfaceName}` : interfaceName,
+    enumName: (name, interfaceName) => `Enum${interfaceName}${name}`,
     excludeField: (interfaceName, fieldName) => fieldName === 'email_field',
     addField: (interfaceName) => {
-        if(interfaceName === 'Xtestobject') return [
-            {
-                name: "created_by",
-                type: "string"
-            }
-        ]
+        if (interfaceName === 'Xtestobject') return [{
+            name: "created_by",
+            type: "string"
+        }]
     },
     importAsType: (interfaceName) => interfaceName !== 'Xuser'
 }
-module.exports = config;
+module.exports = config;
diff --git a/src/ts-exporter.ts b/src/ts-exporter.ts
@@ -149,7 +149,7 @@ class Converter {
       const outputFile = path.resolve(this.config.output, 'index.ts');
 
       const output = this.strapiModels
-        .map(s => `export * from './${s.ouputFile}';`)
+        .map(s => `export * from './${s.ouputFile.replace('\\', '/')}';`)
         .sort()
         .join('\n');
       fs.writeFileSync(outputFile, output + '\n');
@@ -216,7 +216,7 @@ class Converter {
         let rel = path.normalize(path.relative(path.dirname(m.ouputFile), path.dirname(f.ouputFile)));
         rel = path.normalize(rel + path.sep + path.basename(f.ouputFile))
         if (!rel.startsWith('..')) rel = '.' + path.sep + rel;
-        return rel;
+        return rel.replace('\\', '/').replace('\\', '/');
       }
       return found ? `import ${(this.config.importAsType && this.config.importAsType(m.interfaceName) ? 'type ' : '')}{ ${found.interfaceName} } from '${toFolder(found)}';` : '';
     };