@react-native-oh/react-native-harmony-cli 0.0.36 → 0.0.40-1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (87) hide show
  1. package/dist/autolinking/Autolinking.js +14 -11
  2. package/dist/codegen/generators/AppBuildTimeGlueCodeGenerator.js +2 -1
  3. package/dist/codegen/generators/LibGlueCodeGenerator.js +2 -2
  4. package/dist/codegen/generators/UberGeneratorV1.js +9 -2
  5. package/dist/codegen/generators/UberGeneratorV2.js +8 -1
  6. package/dist/codegen/templates/BasePackageHTemplate.js +12 -1
  7. package/dist/codegen/templates/RNOHGeneratedPackageHTemplate.js +12 -1
  8. package/dist/commands/codegen-harmony.js +16 -5
  9. package/dist/commands/run-harmony.js +49 -27
  10. package/dist/core/ProjectDependenciesManager.js +5 -7
  11. package/dist/simulator/LaunchSimulator.js +318 -0
  12. package/dist/simulator/index.js +23 -0
  13. package/harmony/rnoh-hvigor-plugin-0.3.0.tgz +0 -0
  14. package/package.json +13 -5
  15. package/.prettierrc +0 -6
  16. package/src/assetResolver.ts +0 -134
  17. package/src/autolinking/Autolinking.test.ts +0 -483
  18. package/src/autolinking/Autolinking.ts +0 -382
  19. package/src/autolinking/index.ts +0 -8
  20. package/src/codegen/core/CodeGenerator.ts +0 -16
  21. package/src/codegen/core/CodegenError.ts +0 -10
  22. package/src/codegen/core/EventUtils.ts +0 -23
  23. package/src/codegen/core/TypeAnnotationToTS.test.ts +0 -82
  24. package/src/codegen/core/TypeAnnotationToTS.ts +0 -195
  25. package/src/codegen/core/UberSchema.ts +0 -152
  26. package/src/codegen/core/index.ts +0 -12
  27. package/src/codegen/generators/AppBuildTimeGlueCodeGenerator.ts +0 -120
  28. package/src/codegen/generators/ArkTSComponentCodeGeneratorArkTS.ts +0 -128
  29. package/src/codegen/generators/ArkTSComponentCodeGeneratorCAPI.ts +0 -122
  30. package/src/codegen/generators/CppComponentCodeGenerator.ts +0 -95
  31. package/src/codegen/generators/LibGlueCodeGenerator.ts +0 -98
  32. package/src/codegen/generators/NativeModuleCodeGenerator.ts +0 -124
  33. package/src/codegen/generators/SharedComponentCodeGenerator.ts +0 -57
  34. package/src/codegen/generators/UberGeneratorV1.ts +0 -75
  35. package/src/codegen/generators/UberGeneratorV2.ts +0 -114
  36. package/src/codegen/generators/index.ts +0 -15
  37. package/src/codegen/index.ts +0 -9
  38. package/src/codegen/templates/BaseComponentInstanceHTemplate.ts +0 -128
  39. package/src/codegen/templates/BasePackageHTemplate.ts +0 -147
  40. package/src/codegen/templates/ComponentDescriptorHTemplate.ts +0 -63
  41. package/src/codegen/templates/ComponentJSIBinderHTemplate.ts +0 -121
  42. package/src/codegen/templates/ComponentUtilsTSTemplate.ts +0 -222
  43. package/src/codegen/templates/IndexTSTemplate.ts +0 -62
  44. package/src/codegen/templates/RNOHGeneratedPackageHTemplate.ts +0 -138
  45. package/src/codegen/templates/TurboModuleCppTemplate.ts +0 -61
  46. package/src/codegen/templates/TurboModuleHTemplate.ts +0 -42
  47. package/src/codegen/templates/TurboModuleSpecTSTemplate.ts +0 -101
  48. package/src/codegen/templates/index.ts +0 -16
  49. package/src/commands/bundle-harmony.ts +0 -134
  50. package/src/commands/codegen-harmony.ts +0 -297
  51. package/src/commands/codegen-lib-harmony.ts +0 -389
  52. package/src/commands/create-metro-host-constants.ts +0 -55
  53. package/src/commands/index.ts +0 -16
  54. package/src/commands/init.ts +0 -755
  55. package/src/commands/link-harmony.ts +0 -102
  56. package/src/commands/pack-harmony.ts +0 -128
  57. package/src/commands/run-harmony.ts +0 -478
  58. package/src/commands/types.ts +0 -21
  59. package/src/commands/unpack-harmony.ts +0 -238
  60. package/src/commands/verify-package-harmony.ts +0 -113
  61. package/src/core/AbsolutePath.ts +0 -66
  62. package/src/core/CodegenConfig.ts +0 -67
  63. package/src/core/DescriptiveError.ts +0 -68
  64. package/src/core/FileSystem.ts +0 -57
  65. package/src/core/OHPackageJSON5.ts +0 -30
  66. package/src/core/PackageJSON.ts +0 -104
  67. package/src/core/ProjectDependenciesManager.ts +0 -103
  68. package/src/core/ValidationError.ts +0 -8
  69. package/src/core/ValueObject.ts +0 -9
  70. package/src/core/fs.ts +0 -38
  71. package/src/core/index.ts +0 -17
  72. package/src/index.ts +0 -33
  73. package/src/io/CliExecutor.ts +0 -69
  74. package/src/io/Logger.ts +0 -112
  75. package/src/io/RealFS.ts +0 -62
  76. package/src/io/TarGz.ts +0 -33
  77. package/src/io/__fixtures__.ts +0 -139
  78. package/src/io/fsUtils.ts +0 -44
  79. package/src/io/index.ts +0 -11
  80. package/src/package-verifier/checks/HarmonyDirContainsOnlyHarsCheck.ts +0 -35
  81. package/src/package-verifier/checks/HarmonyDirExistsCheck.ts +0 -31
  82. package/src/package-verifier/checks/NpmAnAndOhPackageVersionsAreEqual.ts +0 -25
  83. package/src/package-verifier/checks/OhPackageNameFollowsNamingConventionCheck.ts +0 -54
  84. package/src/package-verifier/checks/index.ts +0 -11
  85. package/src/package-verifier/index.ts +0 -9
  86. package/src/package-verifier/types.ts +0 -19
  87. package/src/package-verifier/verify-package.ts +0 -123
@@ -1,62 +0,0 @@
1
- /**
2
- * Copyright (c) 2024 Huawei Technologies Co., Ltd.
3
- *
4
- * This source code is licensed under the MIT license found in the
5
- * LICENSE-MIT file in the root directory of this source tree.
6
- */
7
-
8
- import mustache from 'mustache';
9
-
10
- const TEMPLATE = `
11
- /**
12
- {{#codegenNoticeLines}}
13
- * {{{line}}}
14
- {{/codegenNoticeLines}}
15
- */
16
-
17
- {{#reexports}}
18
- export * {{as}}from "{{{from}}}"
19
- {{/reexports}}
20
- `;
21
-
22
- const TEMPLATE_EMPTY = `
23
- /**
24
- {{#codegenNoticeLines}}
25
- * {{{line}}}
26
- {{/codegenNoticeLines}}
27
- */
28
-
29
- export {}
30
- `;
31
-
32
- type Reexport = {
33
- from: string;
34
- as?: string;
35
- };
36
-
37
- export class IndexTSTemplate {
38
- private reexports: Reexport[] = [];
39
-
40
- constructor(private codegenNoticeLines: string[]) {}
41
-
42
- addReexport(reexport: Reexport) {
43
- this.reexports.push(reexport);
44
- return this;
45
- }
46
-
47
- build(): string {
48
- if (this.reexports.length === 0) {
49
- return mustache.render(TEMPLATE_EMPTY, {});
50
- }
51
-
52
- return mustache.render(TEMPLATE.trimStart(), {
53
- codegenNoticeLines: this.codegenNoticeLines.map((line) => ({
54
- line,
55
- })),
56
- reexports: this.reexports.map((reexport) => ({
57
- from: reexport.from,
58
- as: reexport.as ? `as ${reexport.as} ` : '',
59
- })),
60
- });
61
- }
62
- }
@@ -1,138 +0,0 @@
1
- /**
2
- * Copyright (c) 2024 Huawei Technologies Co., Ltd.
3
- *
4
- * This source code is licensed under the MIT license found in the
5
- * LICENSE-MIT file in the root directory of this source tree.
6
- */
7
-
8
- import mustache from 'mustache';
9
-
10
- const TEMPLATE = `
11
- /**
12
- * This code was generated by "react-native codegen-harmony"
13
- *
14
- * Do not edit this file as changes may cause incorrect behavior and will be
15
- * lost once the code is regenerated.
16
- *
17
- * @generatorVersion: 1
18
- */
19
-
20
- #pragma once
21
-
22
- #include "RNOH/Package.h"
23
- #include "RNOH/ArkTSTurboModule.h"
24
- {{#turboModules}}
25
- #include "generated/{{name}}.h"
26
- {{/turboModules}}
27
- {{#components}}
28
- #include "generated/{{name}}ComponentDescriptor.h"
29
- {{/components}}
30
- {{#components}}
31
- #include "generated/{{name}}JSIBinder.h"
32
- {{/components}}
33
-
34
- namespace rnoh {
35
-
36
- class RNOHGeneratedPackageTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
37
- public:
38
- SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override {
39
- {{#turboModules}}
40
- if (name == "{{name}}") {
41
- return std::make_shared<{{name}}>(ctx, name);
42
- }
43
- {{/turboModules}}
44
- return nullptr;
45
- };
46
- };
47
-
48
- class GeneratedEventEmitRequestHandler : public EventEmitRequestHandler {
49
- public:
50
- void handleEvent(Context const &ctx) override {
51
- auto eventEmitter = ctx.shadowViewRegistry->getEventEmitter<facebook::react::EventEmitter>(ctx.tag);
52
- if (eventEmitter == nullptr) {
53
- return;
54
- }
55
-
56
- std::vector<std::string> supportedEventNames = {
57
- {{#supportedEvents}}
58
- "{{name}}",
59
- {{/supportedEvents}}
60
- };
61
- if (std::find(supportedEventNames.begin(), supportedEventNames.end(), ctx.eventName) != supportedEventNames.end()) {
62
- eventEmitter->dispatchEvent(ctx.eventName, ArkJS(ctx.env).getDynamic(ctx.payload));
63
- }
64
- }
65
- };
66
-
67
- class RNOHGeneratedPackage : public Package {
68
- public:
69
- RNOHGeneratedPackage(Package::Context ctx) : Package(ctx){};
70
-
71
- std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override {
72
- return std::make_unique<RNOHGeneratedPackageTurboModuleFactoryDelegate>();
73
- }
74
-
75
- std::vector<facebook::react::ComponentDescriptorProvider> createComponentDescriptorProviders() override {
76
- return {
77
- {{#components}}
78
- facebook::react::concreteComponentDescriptorProvider<facebook::react::{{name}}ComponentDescriptor>(),
79
- {{/components}}
80
- };
81
- }
82
-
83
- ComponentJSIBinderByString createComponentJSIBinderByName() override {
84
- return {
85
- {{#components}}
86
- {"{{name}}", std::make_shared<{{name}}JSIBinder>()},
87
- {{/components}}
88
- };
89
- };
90
-
91
- EventEmitRequestHandlers createEventEmitRequestHandlers() override {
92
- return {
93
- std::make_shared<GeneratedEventEmitRequestHandler>(),
94
- };
95
- }
96
- };
97
-
98
- } // namespace rnoh
99
- `;
100
-
101
- type RNOHGeneratedPackageTurboModule = {
102
- name: string;
103
- };
104
-
105
- type RNOHGeneratedPackageComponent = {
106
- name: string;
107
- supportedEventNames: string[];
108
- };
109
-
110
- export class RNOHGeneratedPackageHTemplate {
111
- private turboModules: RNOHGeneratedPackageTurboModule[] = [];
112
- private components: RNOHGeneratedPackageComponent[] = [];
113
- private supportedEventNames: string[] = [];
114
-
115
- constructor() {}
116
-
117
- addTurboModule(turboModule: RNOHGeneratedPackageTurboModule) {
118
- this.turboModules.push(turboModule);
119
- }
120
-
121
- addComponent(component: RNOHGeneratedPackageComponent) {
122
- this.components.push(component);
123
- this.supportedEventNames = [
124
- ...this.supportedEventNames,
125
- ...component.supportedEventNames,
126
- ];
127
- }
128
-
129
- build(): string {
130
- return mustache.render(TEMPLATE.trimStart(), {
131
- turboModules: this.turboModules,
132
- components: this.components,
133
- supportedEvents: this.supportedEventNames.map((eventName) => ({
134
- name: eventName,
135
- })),
136
- });
137
- }
138
- }
@@ -1,61 +0,0 @@
1
- /**
2
- * Copyright (c) 2024 Huawei Technologies Co., Ltd.
3
- *
4
- * This source code is licensed under the MIT license found in the
5
- * LICENSE-MIT file in the root directory of this source tree.
6
- */
7
-
8
- import mustache from 'mustache';
9
-
10
- const TEMPLATE = `
11
- /**
12
- {{#codegenNoticeLines}}
13
- * {{{line}}}
14
- {{/codegenNoticeLines}}
15
- */
16
-
17
- #include "{{className}}.h"
18
-
19
- namespace rnoh {
20
- using namespace facebook;
21
-
22
- {{className}}::{{className}}(const ArkTSTurboModule::Context ctx, const std::string name) : ArkTSTurboModule(ctx, name) {
23
- methodMap_ = {
24
- {{#methods}}
25
- ARK_{{asyncMarker}}METHOD_METADATA({{name}}, {{argsCount}}),
26
- {{/methods}}
27
- };
28
- }
29
-
30
- } // namespace rnoh
31
- `;
32
-
33
- export type TurboModuleCppTemplateMethod = {
34
- name: string;
35
- isAsync: boolean;
36
- argsCount: number;
37
- };
38
-
39
- export class TurboModuleCppTemplate {
40
- private methods: TurboModuleCppTemplateMethod[] = [];
41
-
42
- constructor(private name: string, private codegenNoticeLines: string[]) {}
43
-
44
- addMethod(method: TurboModuleCppTemplateMethod) {
45
- this.methods.push(method);
46
- }
47
-
48
- build(): string {
49
- return mustache.render(TEMPLATE.trimStart(), {
50
- codegenNoticeLines: this.codegenNoticeLines.map((line) => ({
51
- line,
52
- })),
53
- className: this.name,
54
- methods: this.methods.map((method) => ({
55
- name: method.name,
56
- argsCount: method.argsCount,
57
- asyncMarker: method.isAsync ? 'ASYNC_' : undefined,
58
- })),
59
- });
60
- }
61
- }
@@ -1,42 +0,0 @@
1
- /**
2
- * Copyright (c) 2024 Huawei Technologies Co., Ltd.
3
- *
4
- * This source code is licensed under the MIT license found in the
5
- * LICENSE-MIT file in the root directory of this source tree.
6
- */
7
-
8
- import mustache from 'mustache';
9
-
10
- const TEMPLATE = `
11
- /**
12
- {{#codegenNoticeLines}}
13
- * {{{line}}}
14
- {{/codegenNoticeLines}}
15
- */
16
-
17
- #pragma once
18
-
19
- #include "RNOH/ArkTSTurboModule.h"
20
-
21
- namespace rnoh {
22
-
23
- class JSI_EXPORT {{className}} : public ArkTSTurboModule {
24
- public:
25
- {{className}}(const ArkTSTurboModule::Context ctx, const std::string name);
26
- };
27
-
28
- } // namespace rnoh
29
- `;
30
-
31
- export class TurboModuleHTemplate {
32
- constructor(private name: string, private codegenNoticeLines: string[]) {}
33
-
34
- build(): string {
35
- return mustache.render(TEMPLATE.trimStart(), {
36
- className: this.name,
37
- codegenNoticeLines: this.codegenNoticeLines.map((line) => ({
38
- line,
39
- })),
40
- });
41
- }
42
- }
@@ -1,101 +0,0 @@
1
- /**
2
- * Copyright (c) 2024 Huawei Technologies Co., Ltd.
3
- *
4
- * This source code is licensed under the MIT license found in the
5
- * LICENSE-MIT file in the root directory of this source tree.
6
- */
7
-
8
- import mustache from 'mustache';
9
-
10
- const TEMPLATE = `
11
- /**
12
- {{#codegenNoticeLines}}
13
- * {{{line}}}
14
- {{/codegenNoticeLines}}
15
- */
16
-
17
- import { Tag } from "{{{rnohImport}}}"
18
-
19
- export namespace {{name}} {
20
- export const NAME = '{{name}}' as const
21
-
22
- {{#enums}}
23
- export enum {{name}} {
24
- {{#members}}
25
- {{name}} = {{{value}}},
26
- {{/members}}
27
- }
28
-
29
- {{/enums}}
30
- {{#aliases}}
31
- export type {{name}} = {{{type}}}
32
-
33
- {{/aliases}}
34
- export interface Spec {
35
- {{#methods}}
36
- {{name}}({{{stringifiedArgs}}}): {{{returnType}}};
37
-
38
- {{/methods}}
39
- }
40
- }
41
- `;
42
-
43
- type Alias = {
44
- name: string;
45
- type: string;
46
- };
47
-
48
- type EnumModel = {
49
- name: string;
50
- members: {
51
- name: string;
52
- value: string;
53
- }[];
54
- };
55
-
56
- type Method = {
57
- name: string;
58
- stringifiedArgs: string;
59
- returnType: string;
60
- };
61
-
62
- export class TurboModuleInterfaceTS {
63
- private methods: Method[] = [];
64
- private aliases: Alias[] = [];
65
- private enumModels: EnumModel[] = [];
66
-
67
- constructor(
68
- private name: string,
69
- private codegenNoticeLines: string[],
70
- private rnohImport: string
71
- ) {}
72
-
73
- addAlias(alias: Alias) {
74
- this.aliases.push(alias);
75
- }
76
-
77
- addEnum(enumModel: EnumModel) {
78
- this.enumModels.push(enumModel);
79
- }
80
-
81
- addMethod(method: Method) {
82
- this.methods.push(method);
83
- }
84
-
85
- build(): string {
86
- return mustache.render(TEMPLATE.trimStart(), {
87
- codegenNoticeLines: this.codegenNoticeLines.map((line) => ({
88
- line,
89
- })),
90
- name: this.name,
91
- aliases: this.aliases,
92
- enums: this.enumModels,
93
- rnohImport: this.rnohImport,
94
- methods: this.methods.map((method) => ({
95
- name: method.name,
96
- stringifiedArgs: method.stringifiedArgs,
97
- returnType: method.returnType,
98
- })),
99
- });
100
- }
101
- }
@@ -1,16 +0,0 @@
1
- /**
2
- * Copyright (c) 2024 Huawei Technologies Co., Ltd.
3
- *
4
- * This source code is licensed under the MIT license found in the
5
- * LICENSE-MIT file in the root directory of this source tree.
6
- */
7
-
8
- export * from './TurboModuleHTemplate';
9
- export * from './TurboModuleCppTemplate';
10
- export * from './RNOHGeneratedPackageHTemplate';
11
- export * from './ComponentJSIBinderHTemplate';
12
- export * from './ComponentDescriptorHTemplate';
13
- export * from './ComponentUtilsTSTemplate';
14
- export * from './IndexTSTemplate';
15
- export * from './TurboModuleSpecTSTemplate';
16
- export * from './BaseComponentInstanceHTemplate';
@@ -1,134 +0,0 @@
1
- /**
2
- * Copyright (c) 2024-2025 Huawei Technologies Co., Ltd.
3
- *
4
- * This source code is licensed under the MIT license found in the
5
- * LICENSE-MIT file in the root directory of this source tree.
6
- */
7
-
8
- import { Command } from './types';
9
- import fs from 'fs';
10
- import fse from 'fs-extra';
11
- import Metro from 'metro';
12
- import { RunBuildOptions as BuildOptions } from 'metro';
13
- import MetroServer from 'metro/src/Server';
14
- import pathUtils from 'path';
15
- import { copyAssets } from '../assetResolver';
16
- import { ConfigT as MetroConfig } from 'metro-config';
17
- import { Logger } from '../io';
18
-
19
- const ARK_RESOURCE_PATH = './harmony/entry/src/main/resources/rawfile';
20
- const ASSETS_DEFAULT_DEST_PATH =
21
- './harmony/entry/src/main/resources/rawfile/assets';
22
-
23
- type AssetData = Metro.AssetData;
24
- type Bundle = { code: string; map: string };
25
- type Path = string;
26
-
27
- export const commandBundleHarmony: Command = {
28
- name: 'bundle-harmony',
29
- description:
30
- 'Creates JS bundle, creates a special cpp header containing the JS code, copies assets directory to the project.',
31
- options: [
32
- {
33
- name: '--dev [boolean]',
34
- description: 'If false, warnings are disabled and the bundle is minified',
35
- parse: (val: string) => val !== 'false',
36
- default: true,
37
- },
38
- {
39
- name: '--entry-file <path>',
40
- description:
41
- 'Path to the root JS file, either absolute or relative to JS root',
42
- default: 'index.js',
43
- },
44
- {
45
- name: '--config <path>',
46
- description: 'Path to the Metro configuration file',
47
- },
48
- {
49
- name: '--bundle-output <path>',
50
- description:
51
- 'File name where to store the resulting bundle, ex. /tmp/groups.bundle',
52
- default: ARK_RESOURCE_PATH + '/bundle.harmony.js',
53
- },
54
- {
55
- name: '--assets-dest <path>',
56
- description:
57
- 'Directory name where to store assets referenced in the bundle',
58
- default: ASSETS_DEFAULT_DEST_PATH,
59
- },
60
- {
61
- name: '--sourcemap-output <path>',
62
- description:
63
- 'File name where to store the resulting source map, ex. /tmp/groups.map',
64
- },
65
- {
66
- name: '--minify [boolean]',
67
- description: 'Allows overriding whether bundle is minified',
68
- parse: (val: string) => val !== 'false',
69
- },
70
- ],
71
- func: async (argv, config, args: any) => {
72
- const logger = new Logger();
73
- const buildOptions: BuildOptions = {
74
- entry: args.entryFile,
75
- platform: 'harmony',
76
- minify: args.minify !== undefined ? args.minify : !args.dev,
77
- dev: args.dev,
78
- sourceMap: args.sourcemapOutput,
79
- sourceMapUrl: args.sourcemapOutput,
80
- };
81
- const metroConfig = await loadMetroConfig(args.config);
82
- const bundle = await createBundle(metroConfig, buildOptions);
83
- await saveBundle(bundle, args.bundleOutput, args.sourcemapOutput);
84
- const assets = await retrieveAssetsData(metroConfig, buildOptions);
85
- copyAssets(logger, assets, args.assetsDest);
86
- },
87
- };
88
-
89
- async function loadMetroConfig(
90
- configPath: Path | undefined
91
- ): Promise<MetroConfig> {
92
- return configPath
93
- ? await Metro.loadConfig({ config: configPath })
94
- : await Metro.loadConfig();
95
- }
96
-
97
- async function createBundle(
98
- metroConfig: MetroConfig,
99
- buildOptions: BuildOptions
100
- ): Promise<Bundle> {
101
- // casting needed as Metro.runBuild returns Promise<{code: string, map: string}>
102
- // despite being typed as Promise<void>
103
- return (await Metro.runBuild(metroConfig, buildOptions)) as unknown as Bundle;
104
- }
105
-
106
- async function saveBundle(
107
- bundle: Bundle,
108
- bundleOutput: Path,
109
- sourceMapOutput: Path | undefined
110
- ) {
111
- await fse.ensureDir(pathUtils.dirname(bundleOutput));
112
- fs.writeFileSync(bundleOutput, bundle.code);
113
- console.log(`[CREATED] ${bundleOutput}`);
114
- if (sourceMapOutput) {
115
- fs.writeFileSync(sourceMapOutput, bundle.map);
116
- console.log(`[CREATED] ${sourceMapOutput}`);
117
- }
118
- }
119
-
120
- async function retrieveAssetsData(
121
- metroConfig: MetroConfig,
122
- buildOptions: BuildOptions
123
- ): Promise<readonly AssetData[]> {
124
- const metroServer = new MetroServer(metroConfig);
125
- try {
126
- return await metroServer.getAssets({
127
- ...MetroServer.DEFAULT_BUNDLE_OPTIONS,
128
- ...buildOptions,
129
- entryFile: buildOptions.entry,
130
- });
131
- } finally {
132
- metroServer.end();
133
- }
134
- }