chore: use separator constants from path

Author: phani-srikar

packages/amplify-codegen/src/commands/models.js

@@ -8,6 +8,7 @@ const defaultDirectiveDefinitions = require('../utils/defaultDirectiveDefinition
 const getProjectRoot = require('../utils/getProjectRoot');
 const { getModelSchemaPathParam, hasModelSchemaPathParam } = require('../utils/getModelSchemaPathParam');
 const { isDataStoreEnabled } = require('graphql-transformer-core');
+const { normalizePathForGlobPattern } = require('../utils/input-params-manager');
 
 /**
  * Amplify Context type.
@@ -305,7 +306,7 @@ function loadSchema(apiResourcePath) {
   }
   if (fs.pathExistsSync(schemaDirectory) && fs.lstatSync(schemaDirectory).isDirectory()) {
     // search recursively for graphql schema files inside `schema` directory
-    const schemas = globby.sync([path.join(schemaDirectory, '**/*.graphql')].map((path) => path.replace(/\\/g, '/')));
+    const schemas = globby.sync([path.join(schemaDirectory, '**/*.graphql')].map((path) => normalizePathForGlobPattern(path)));
     return schemas.map(file => fs.readFileSync(file, 'utf8')).join('\n');
   }
 

packages/amplify-codegen/src/commands/types.js

@@ -9,6 +9,7 @@ const { loadConfig } = require('../codegen-config');
 const { ensureIntrospectionSchema, getFrontEndHandler, getAppSyncAPIDetails, getAppSyncAPIInfoFromProject } = require('../utils');
 const { generateTypes: generateTypesHelper } = require('@aws-amplify/graphql-generator');
 const { extractDocumentFromJavascript } = require('@aws-amplify/graphql-types-generator');
+const { normalizePathForGlobPattern } = require('../utils/input-params-manager');
 
 async function generateTypes(context, forceDownloadSchema, withoutInit = false, decoupleFrontend = '') {
   let frontend = decoupleFrontend;
@@ -58,7 +59,8 @@ async function generateTypes(context, forceDownloadSchema, withoutInit = false,
         const target = cfg.amplifyExtension.codeGenTarget;
 
         const excludes = cfg.excludes.map(pattern => `!${pattern}`);
-        const queryFilePaths = globby.sync([...includeFiles, ...excludes].map((path) => path.replace(/\\/g, '/')), {
+        const normalizedPatterns = [...includeFiles, ...excludes].map((path) => normalizePathForGlobPattern(path));
+        const queryFilePaths = globby.sync(normalizedPatterns, {
           cwd: projectPath,
           absolute: true,
         });

packages/amplify-codegen/src/utils/input-params-manager.js

@@ -1,4 +1,5 @@
 const constants = require('../constants');
+const path = require('path');
 
 function normalizeInputParams(context) {
   let inputParams;
@@ -66,6 +67,12 @@ function normalizeValue(key, value) {
   return value;
 }
 
+function normalizePathForGlobPattern(pattern) {
+  const splits = pattern.split(path.win32.sep);
+  return splits.join(path.posix.sep);
+}
+
 module.exports = {
   normalizeInputParams,
+  normalizePathForGlobPattern,
 };