PKG -- [flow-cadut-generator] Add named exports to generated index files (#111)

jribbink · web-flow · commit e4f08c0da948 · 2022-08-05T13:44:25.000-07:00
diff --git a/.changeset/stupid-berries-invent.md b/.changeset/stupid-berries-invent.md
@@ -0,0 +1,5 @@
+---
+"@onflow/flow-cadut-generator": minor
+---
+
+Add named exports to index files generated by flow-cadut-generator
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,6 +6,7 @@
     "lint": "eslint .",
     "lintfix": "eslint --fix .",
     "prerelease": "npm run build && npm run test",
+    "regenerate-test": "npm run build && npm run --prefix packages/flow-cadut-generator precompile-handlebars && npm run --prefix packages/generator-test generate",
     "release": "changeset publish"
   },
   "workspaces": [
diff --git a/packages/flow-cadut-generator/package.json b/packages/flow-cadut-generator/package.json
@@ -19,6 +19,7 @@
   "scripts": {
     "build": "fcl-bundle",
     "dev": "fcl-bundle --watch",
+    "precompile-handlebars": "handlebars ./src/templates -f ./src/templates/index.js -e hbs -c handlebars",
     "test": "jest"
   },
   "mangle": {
@@ -29,7 +30,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.6",
-    "@onflow/flow-cadut": "^0.2.0-alpha.7"
+    "@onflow/flow-cadut": "^0.2.0-alpha.7",
+    "handlebars": "^4.7.7",
+    "handlebars-loader": "^1.7.1"
   },
   "bin": {
     "flow-generate": "./dist/generate.js"
diff --git a/packages/flow-cadut-generator/src/templates/index.js b/packages/flow-cadut-generator/src/templates/index.js
diff --git a/packages/flow-cadut-generator/src/templates/package.hbs b/packages/flow-cadut-generator/src/templates/package.hbs
@@ -10,6 +10,18 @@
   import { {{this}}Template, deploy{{this}} } from './{{this}}'
 {{/each}}
 
+export {
+    {{#each folders}}
+        {{ this }},
+    {{/each}}
+    {{#each files}}
+        {{ this }}Template, {{ this }},
+    {{/each}}
+    {{#each contracts}}
+      {{ this }}Template, deploy{{ this }},
+    {{/each}}
+}
+
 export default {
     {{#each folders}}
         {{ this }},
diff --git a/packages/flow-cadut/package.json b/packages/flow-cadut/package.json
@@ -27,19 +27,14 @@
     "build": "fcl-bundle",
     "watch": "fcl-bundle --watch",
     "test": "jest",
-    "check-headers": "sh ./check-headers.sh",
-    "precompile-handlebars": "node_modules/.bin/handlebars ./generator/src/templates -f ./generator/src/templates/index.js -e hbs -c handlebars",
-    "generate-dev": "flow-generate ./generator-test/cadence ./generator-test/src/generated -d ../../../../src",
-    "regenerate-test": "npm run precompile-handlebars && npm run generate-dev"
+    "check-headers": "sh ./check-headers.sh"
   },
   "dependencies": {
     "@babel/runtime": "^7.18.6",
     "@onflow/config": "0.0.2",
     "@onflow/fcl": "^1.1.1-alpha.2",
     "elliptic": "^6.5.4",
     "esm": "^3.2.25",
-    "handlebars": "^4.7.7",
-    "handlebars-loader": "^1.7.1",
     "rimraf": "^3.0.2",
     "rlp": "^3.0.0",
     "sha3": "^2.1.4",
diff --git a/packages/generator-test/package.json b/packages/generator-test/package.json
@@ -5,6 +5,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
+    "generate": "flow-generate ./cadence ./src/generated",
     "test": "node index.js"
   },
   "author": "",
diff --git a/packages/generator-test/src/generated/contracts/index.js b/packages/generator-test/src/generated/contracts/index.js
@@ -1,3 +1,4 @@
 import { BasicTemplate, deployBasic } from "./Basic";
+	export { BasicTemplate, deployBasic };
 	export default { BasicTemplate, deployBasic };
 	
diff --git a/packages/generator-test/src/generated/index.js b/packages/generator-test/src/generated/index.js
@@ -1,5 +1,6 @@
 import contracts from "./contracts";
 	import scripts from "./scripts";
 	import transactions from "./transactions";
+	export { contracts, scripts, transactions };
 	export default { contracts, scripts, transactions };
 	
diff --git a/packages/generator-test/src/generated/scripts/index.js b/packages/generator-test/src/generated/scripts/index.js
@@ -2,6 +2,7 @@ import { basicTemplate, basic } from "./basic";
 	import { logTemplate, log } from "./log";
 	import { metadataTemplate, metadata } from "./metadata";
 	import { panicTemplate, panic } from "./panic";
+	export { basicTemplate, basic, logTemplate, log, metadataTemplate, metadata, panicTemplate, panic };
 	export default {
 	  basicTemplate,
 	  basic,
diff --git a/packages/generator-test/src/generated/transactions/index.js b/packages/generator-test/src/generated/transactions/index.js
@@ -1,4 +1,5 @@
 import { logTemplate, log } from "./log";
 	import { panicTemplate, panic } from "./panic";
+	export { logTemplate, log, panicTemplate, panic };
 	export default { logTemplate, log, panicTemplate, panic };
 	

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@onflow/flow-cadut-generator": minor
 +---
++
 +Add named exports to index files generated by flow-cadut-generator
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`import { BasicTemplate, deployBasic } from "./Basic";`
	`2`	`+ export { BasicTemplate, deployBasic };`
`2`	`3`	`export default { BasicTemplate, deployBasic };`
`3`	`4`