Merge pull request #3828 from cpyle0819/corepyle/#3670

Move elwing libs to main js libs folder.

Author: ford-at-aws

javascriptv3/example_code/libs/ext-ramda.js

@@ -13,7 +13,6 @@ import {
   identity,
   is,
   map,
-  nth,
   prop,
   T,
 } from "ramda";
@@ -28,6 +27,8 @@ const flipApplyMap = curry((funcs) =>
 
 const concatMap = compose(map, concat);
 
+const nthAdjust = curry((i, fn, list) => fn(list[i]));
+
 const parseString = cond([
   [is(String), identity],
   [is(Error), prop("message")],
@@ -36,4 +37,12 @@ const parseString = cond([
 
 const promiseAll = bind(Promise.all, Promise);
 
-export { flipApply, flipMap, flipApplyMap, concatMap, parseString, promiseAll };
+export {
+  flipApply,
+  flipMap,
+  flipApplyMap,
+  concatMap,
+  nthAdjust,
+  parseString,
+  promiseAll,
+};

javascriptv3/example_code/libs/utils/util-fs.js

@@ -2,13 +2,28 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { compose, map, tryCatch, always } from "ramda";
+import {
+  compose,
+  map,
+  tryCatch,
+  always,
+  identity,
+  ifElse,
+  invoker,
+  split,
+  tap,
+  pipe,
+  filter,
+  prop,
+} from "ramda";
 import { unlink, readFile } from "fs/promises";
 import {
   readdirSync,
   createWriteStream,
   readFileSync,
   writeFileSync,
+  existsSync,
+  mkdirSync,
 } from "fs";
 import archiver from "archiver";
 import { fileURLToPath } from "url";
@@ -40,6 +55,16 @@ const handleZipEnd = (resolve, path) => async () => {
   resolve(buffer);
 };
 
+const makeDir = ifElse(existsSync, identity, tap(mkdirSync));
+
+const readLines = pipe(readFileSync, invoker(0, "toString"), split("\n"));
+
+const readSubdirSync = pipe(
+  readdirSync,
+  filter(invoker(0, "isDirectory")),
+  map(prop("name"))
+);
+
 const zip = (inputPath) =>
   new Promise((resolve, reject) => {
     try {
@@ -65,4 +90,13 @@ const zip = (inputPath) =>
     archive.finalize();
   });
 
-export { deleteFiles, dirnameFromMetaUrl, getTmp, setTmp, zip };
+export {
+  deleteFiles,
+  dirnameFromMetaUrl,
+  getTmp,
+  makeDir,
+  readLines,
+  readSubdirSync,
+  setTmp,
+  zip,
+};

javascriptv3/example_code/libs/utils/util-string.js

@@ -2,20 +2,39 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
+import { pipe, adjust, join, split, toLower, map, toUpper } from "ramda";
+
 import { v4 as uuidv4 } from "uuid";
 
-export const getUniqueName = (name) => `${uuidv4()}-${name.toLowerCase()}`;
+const getUniqueName = (name) => `${uuidv4()}-${name.toLowerCase()}`;
 
-/**
- *
- * @param { string } source the string to modify
- * @param { string } str the string to affix to the source
- * @returns { string } the postfixed source
- */
-export const postfix = (source, str) => {
+const postfix = (source, str) => {
   if (typeof str !== "string") {
     throw new Error("Cannot postfix a non-string value.");
   }
 
   return `${source}${str}`;
 };
+
+const downcaseSplit = pipe(toLower, split("-"));
+
+const capitalize = pipe(Array.from, adjust(0, toUpper), join(""));
+
+const kebabCase = pipe(downcaseSplit, join("-"));
+
+const pascalCase = pipe(downcaseSplit, map(capitalize), join(""));
+
+const snakeCase = pipe(downcaseSplit, join("_"));
+
+const titleCase = pipe(downcaseSplit, map(capitalize), join(" "));
+
+export {
+  capitalize,
+  downcaseSplit,
+  getUniqueName,
+  kebabCase,
+  pascalCase,
+  postfix,
+  snakeCase,
+  titleCase,
+};

resources/clients/react/elwing/libs/ext-ramda.ts

@@ -2,6 +2,7 @@
   "name": "elwing",
   "version": "0.1.0",
   "private": true,
+  "type": "module",
   "dependencies": {
     "@cloudscape-design/components": "^3.0.65",
     "@cloudscape-design/global-styles": "^1.0.1",

resources/clients/react/elwing/libs/utils/util-fs.ts

@@ -9,8 +9,8 @@ import {
   pascalCase,
   snakeCase,
   titleCase,
-} from "../../libs/utils/util-string";
-import { copyright } from "./copyright";
+} from "../../../../../../javascriptv3/example_code/libs/utils/util-string.js";
+import { copyright } from "./copyright.js";
 
 const makePluginContents = (pluginName: string) => {
   const fileData = `

resources/clients/react/elwing/libs/utils/util-string.ts

@@ -4,12 +4,19 @@
  */
 
 import { writeFileSync } from "fs";
-import { kebabCase, pascalCase } from "../../libs/utils/util-string";
-import { nthAdjust } from "../../libs/ext-ramda";
-import { getArgValidationErrors } from "./validations";
-import { makePluginPath } from "./path-builder";
-import { makeComponentContents, makePluginContents, makePackageJsonContents } from "./content-builder";
-import { refreshRegistry } from "./register";
+import {
+  kebabCase,
+  pascalCase,
+} from "../../../../../../javascriptv3/example_code/libs/utils/util-string.js";
+import { nthAdjust } from "../../../../../../javascriptv3/example_code/libs/ext-ramda.js";
+import { getArgValidationErrors } from "./validations.js";
+import { makePluginPath } from "./path-builder.js";
+import {
+  makeComponentContents,
+  makePluginContents,
+  makePackageJsonContents,
+} from "./content-builder.js";
+import { refreshRegistry } from "./register.js";
 import { execSync } from "child_process";
 
 (async () => {
@@ -24,10 +31,13 @@ import { execSync } from "child_process";
   const path = makePluginPath(pluginName);
   const pluginContents = makePluginContents(pluginName);
   const componentContents = makeComponentContents(pluginName);
-  const packageJsonContents = makePackageJsonContents(pluginName)
+  const packageJsonContents = makePackageJsonContents(pluginName);
   writeFileSync(`${path}/package.json`, packageJsonContents);
   writeFileSync(`${path}/index.ts`, pluginContents);
-  writeFileSync(`${path}/${pascalCase(pluginName)}Component.tsx`, componentContents);
+  writeFileSync(
+    `${path}/${pascalCase(pluginName)}Component.tsx`,
+    componentContents
+  );
   writeFileSync(`${path}/.gitignore`, "node_modules");
   execSync(`npm i file:src/plugins/${pluginName}`);
   refreshRegistry();

resources/clients/react/elwing/package-lock.json

@@ -4,8 +4,13 @@
  */
 
 import { pipe, concat } from "ramda";
-import { makeDir } from "../../libs/utils/util-fs";
-import { kebabCase } from "../../libs/utils/util-string";
+import {
+  makeDir,
+  dirnameFromMetaUrl,
+} from "../../../../../../javascriptv3/example_code/libs/utils/util-fs.js";
+import { kebabCase } from "../../../../../../javascriptv3/example_code/libs/utils/util-string.js";
+
+const __dirname = dirnameFromMetaUrl(import.meta.url);
 
 const makePluginPath = pipe(
   kebabCase,

resources/clients/react/elwing/package.json

@@ -1,9 +1,14 @@
 import { writeFileSync } from "fs";
 import { format } from "prettier";
 import { concat, join, map, pipe } from "ramda";
-import { readSubdirSync } from "../../libs/utils/util-fs";
-import { pascalCase } from "../../libs/utils/util-string";
-import { copyright } from "./copyright";
+import {
+  dirnameFromMetaUrl,
+  readSubdirSync,
+} from "../../../../../../javascriptv3/example_code/libs/utils/util-fs.js";
+import { pascalCase } from "../../../../../../javascriptv3/example_code/libs/utils/util-string.js";
+import { copyright } from "./copyright.js";
+
+const __dirname = dirnameFromMetaUrl(import.meta.url);
 
 const pluginsPath = `${__dirname}/../plugins`;
 const manifestPath = `${__dirname}/../plugins/manifest.ts`;

resources/clients/react/elwing/src/plugin-creator/content-builder.ts

@@ -4,7 +4,7 @@
  */
 
 import { pipe, length, equals, nth, test, isNil } from "ramda";
-import { validate, validationErrors } from "../../libs/validator";
+import { validate, validationErrors } from "../../libs/validator.js";
 
 const pluginNamePattern = /^[A-Za-z]+-?[A-Za-z]+$/;
 

resources/clients/react/elwing/src/plugin-creator/index.ts

@@ -17,8 +17,9 @@
     "jsx": "react-jsx"
   },
   "ts-node": {
+    "esm": true,
     "compilerOptions": {
-      "module": "CommonJS"
+      "module": "ESNext"
     }
   },
   "include": ["src"]