feat: implement react-feature generator (#35)

* feat: implement react-feature generator * feat: improve react-feature generator
solana-developers · Feb 23, 2024 · e31e290 · e31e290
1 parent 73f633c
commit e31e290
Show file tree

Hide file tree

Showing 32 changed files with 5,041 additions and 374 deletions.
diff --git a/packages/preset-anchor/README.md b/packages/preset-anchor/README.md
@@ -18,8 +18,8 @@ Name:  anchor-application (aliases: application, preset)
 Options:
     --name          Name of the application                             [string]
     --template      The template to use            [string] [choices: "counter",
-                                                        "hello-world"] [default:
-                                                                      "counter"]
+                                                          "hello-world", "none"]
+                                                               [default: "none"]
     --skipFormat    Skip formatting files                              [boolean]
 ```
 

diff --git a/...src/generators/anchor-application/__snapshots__/anchor-application-generator.spec.ts.snap b/...src/generators/anchor-application/__snapshots__/anchor-application-generator.spec.ts.snap
@@ -376,7 +376,6 @@ exports[`anchor-application generator should generate app with "counter" templat
           "import { IDL as CounterIDL } from '../target/types/counter';",
           "// Re-export the generated IDL and type",
           "export { Counter, CounterIDL };",
-          "export type CounterProgram = Program<Counter>;",
           "// After updating your program ID (e.g. after running \`anchor keys sync\`) update the value below.",
           "export const COUNTER_PROGRAM_ID = new PublicKey(",
           "'CounNZdmsQmWh7uVngV9FXW2dZ6zAgbJyYsvBpqbykg'",
@@ -1215,7 +1214,6 @@ exports[`anchor-application generator should generate app with "hello-world" tem
           "import { IDL as HelloWorldIDL } from '../target/types/hello_world';",
           "// Re-export the generated IDL and type",
           "export { HelloWorld, HelloWorldIDL };",
-          "export type HelloWorldProgram = Program<HelloWorld>;",
         ],
         "isBinary": false,
         "path": "anchor-app/src/hello-world-exports.ts",

diff --git a/packages/preset-anchor/src/generators/anchor-application/anchor-application-generator.ts b/packages/preset-anchor/src/generators/anchor-application/anchor-application-generator.ts
@@ -41,12 +41,14 @@ export async function anchorApplicationGenerator(tree: Tree, rawOptions: AnchorA
     directory: project.root,
     skipUpdateIndexTs: true,
   })
-  await anchorTemplateGenerator(tree, {
-    projectName: options.name,
-    name: options.template,
-    template: options.template,
-    directory: project.root,
-  })
+  if (options.template !== 'none') {
+    await anchorTemplateGenerator(tree, {
+      projectName: options.name,
+      name: options.template,
+      template: options.template,
+      directory: project.root,
+    })
+  }
   anchorApplicationDependencies(tree)
   anchorApplicationIgnoreFiles(tree, project.sourceRoot.replace('/src', ''))
 

diff --git a/packages/preset-anchor/src/generators/anchor-application/anchor-application-schema.d.ts b/packages/preset-anchor/src/generators/anchor-application/anchor-application-schema.d.ts
@@ -20,5 +20,5 @@ export interface AnchorApplicationSchema {
   /**
    * The template to use
    */
-  template?: "counter" | "hello-world";
+  template?: "counter" | "hello-world" | "none";
 }
diff --git a/packages/preset-anchor/src/generators/anchor-application/anchor-application-schema.json b/packages/preset-anchor/src/generators/anchor-application/anchor-application-schema.json
@@ -22,9 +22,9 @@
     },
     "template": {
       "type": "string",
-      "enum": ["counter", "hello-world"],
+      "enum": ["counter", "hello-world", "none"],
       "description": "The template to use",
-      "default": "counter"
+      "default": "none"
     }
   },
   "required": ["name"]

diff --git a/...nchor/src/generators/anchor-template/__snapshots__/anchor-template-generator.spec.ts.snap b/...nchor/src/generators/anchor-template/__snapshots__/anchor-template-generator.spec.ts.snap
@@ -248,7 +248,6 @@ exports[`anchor-template generator should be able to generate two templates side
           "import { IDL as CounterOneIDL } from '../target/types/counter_one';",
           "// Re-export the generated IDL and type",
           "export { CounterOne, CounterOneIDL };",
-          "export type CounterOneProgram = Program<CounterOne>;",
           "// After updating your program ID (e.g. after running \`anchor keys sync\`) update the value below.",
           "export const COUNTER_ONE_PROGRAM_ID = new PublicKey('CounNZdmsQmWh7uVngV9FXW2dZ6zAgbJyYsvBpqbykg')",
           "// This is a helper function to get the program ID for the CounterOne program depending on the cluster.",
@@ -275,7 +274,6 @@ exports[`anchor-template generator should be able to generate two templates side
           "import { IDL as CounterTwoIDL } from '../target/types/counter_two';",
           "// Re-export the generated IDL and type",
           "export { CounterTwo, CounterTwoIDL };",
-          "export type CounterTwoProgram = Program<CounterTwo>;",
           "// After updating your program ID (e.g. after running \`anchor keys sync\`) update the value below.",
           "export const COUNTER_TWO_PROGRAM_ID = new PublicKey('CounNZdmsQmWh7uVngV9FXW2dZ6zAgbJyYsvBpqbykg')",
           "// This is a helper function to get the program ID for the CounterTwo program depending on the cluster.",
@@ -1273,7 +1271,6 @@ exports[`anchor-template generator should generate files for counter template 1`
           "import { IDL as CounterIDL } from '../target/types/counter';",
           "// Re-export the generated IDL and type",
           "export { Counter, CounterIDL };",
-          "export type CounterProgram = Program<Counter>;",
           "// After updating your program ID (e.g. after running \`anchor keys sync\`) update the value below.",
           "export const COUNTER_PROGRAM_ID = new PublicKey('CounNZdmsQmWh7uVngV9FXW2dZ6zAgbJyYsvBpqbykg')",
           "// This is a helper function to get the program ID for the Counter program depending on the cluster.",
@@ -1786,7 +1783,6 @@ exports[`anchor-template generator should generate files for hello-world templat
           "import { IDL as HelloWorldIDL } from '../target/types/hello_world';",
           "// Re-export the generated IDL and type",
           "export { HelloWorld, HelloWorldIDL };",
-          "export type HelloWorldProgram = Program<HelloWorld>;",
         ],
         "isBinary": false,
         "path": "target/src/hello-world-exports.ts",

diff --git a/...-anchor/src/generators/anchor-template/files/counter/src/__fileName__-exports.ts.template b/...-anchor/src/generators/anchor-template/files/counter/src/__fileName__-exports.ts.template
@@ -5,7 +5,6 @@ import { IDL as <%= className %>IDL } from '../target/types/<%= fileNameUndersco
 
 // Re-export the generated IDL and type
 export { <%= className %>, <%= className %>IDL };
-export type <%= className %>Program = Program<<%= className %>>;
 
 // After updating your program ID (e.g. after running `anchor keys sync`) update the value below.
 export const <%= upperCaseName %>_PROGRAM_ID = new PublicKey('CounNZdmsQmWh7uVngV9FXW2dZ6zAgbJyYsvBpqbykg')

diff --git a/...hor/src/generators/anchor-template/files/hello-world/src/__fileName__-exports.ts.template b/...hor/src/generators/anchor-template/files/hello-world/src/__fileName__-exports.ts.template
@@ -4,4 +4,3 @@ import { IDL as <%= className %>IDL } from '../target/types/<%= fileNameUndersco
 
 // Re-export the generated IDL and type
 export { <%= className %>, <%= className %>IDL };
-export type <%= className %>Program = Program<<%= className %>>;
diff --git a/packages/preset-anchor/src/index.ts b/packages/preset-anchor/src/index.ts
@@ -1,2 +1,4 @@
 export * from './generators/anchor-application/anchor-application-generator'
 export * from './generators/anchor-application/anchor-application-schema'
+export * from './generators/anchor-template/anchor-template-generator'
+export * from './generators/anchor-template/anchor-template-schema'
diff --git a/...ommon/src/generators/common-template/__snapshots__/common-template-generator.spec.ts.snap b/...ommon/src/generators/common-template/__snapshots__/common-template-generator.spec.ts.snap
@@ -5,7 +5,7 @@ exports[`common-template generator should generate files for { template: 'licens
   "LICENSE": {
     "content": [
       "MIT License",
-      "Copyright (c) 2023 test",
+      "Copyright (c) 2024 test",
       "Permission is hereby granted, free of charge, to any person obtaining a copy",
       "of this software and associated documentation files (the "Software"), to deal",
       "in the Software without restriction, including without limitation the rights",
@@ -33,7 +33,7 @@ exports[`common-template generator should generate files for { template: 'licens
   "LICENSE": {
     "content": [
       "MIT License",
-      "Copyright (c) 2023 test",
+      "Copyright (c) 2024 test",
       "Permission is hereby granted, free of charge, to any person obtaining a copy",
       "of this software and associated documentation files (the "Software"), to deal",
       "in the Software without restriction, including without limitation the rights",
@@ -61,7 +61,7 @@ exports[`common-template generator should generate files for { template: 'licens
   "LICENSE": {
     "content": [
       "MIT License",
-      "Copyright (c) 2023 test",
+      "Copyright (c) 2024 test",
       "Permission is hereby granted, free of charge, to any person obtaining a copy",
       "of this software and associated documentation files (the "Software"), to deal",
       "in the Software without restriction, including without limitation the rights",

diff --git a/packages/preset-common/src/generators/common-template/common-template-generator.ts b/packages/preset-common/src/generators/common-template/common-template-generator.ts
@@ -3,7 +3,7 @@ import * as path from 'path'
 import { genericSubstitutions } from '../../utils/generic-substitutions'
 import { CommonTemplateSchema } from './common-template-schema'
 
-export async function commonTemplateGenerator(tree: Tree, options: CommonTemplateSchema, templatePath: string = '') {
+export async function commonTemplateGenerator(tree: Tree, options: CommonTemplateSchema, templatePath = '') {
   const substitutions = genericSubstitutions({
     anchor: options.anchor,
     anchorName: options.anchorName,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,3 @@ import { IDL as <%= className %>IDL } from '../target/types/<%= fileNameUndersco

		// Re-export the generated IDL and type
		export { <%= className %>, <%= className %>IDL };
		export type <%= className %>Program = Program<<%= className %>>;