Dart version update above 3 null safety

README.md

@@ -15,14 +15,14 @@ To use in your app, you can simply [add it to your project's pubspec.yaml as a d
 * [Reverse Text](https://github.com/PureMVC/puremvc-dart-demo-reversetext/wiki)
 
 ## Status
-Production - [Version 2.0.6](https://github.com/PureMVC/puremvc-dart-multicore-framework/blob/master/VERSION)
+Production - [Version 2.0.7](https://github.com/PureMVC/puremvc-dart-multicore-framework/blob/master/VERSION)
 
 ## Platforms / Technologies
 * [Google Dart](http://www.dartlang.org)
 
 ## License
-* PureMVC MultiCore Framework for Dart (Ported) - Copyright � 2012-13 Cliff Hall
-* PureMVC - Copyright � 2006-2013 [Futurescale, Inc](http://futurescale.com).
+* PureMVC MultiCore Framework for Dart (Ported) - Copyright � 2012-13 Cliff Hall
+* PureMVC - Copyright � 2006-2013 [Futurescale, Inc](http://futurescale.com).
 * All rights reserved.
 
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

VERSION

@@ -7,6 +7,15 @@ Release Date: 11/14/2013
        Minor: 6
      Authors: Cliff Hall <[email protected]>
 --------------------------------------------------------------------------
+2.0.7 Update code base to match requirements of mull-safety and Dart SDK version > 3.0.0
+      - environment: sdk: '^3.0.0'
+      - dependencies:
+        build_runner: any
+        build_web_compilers: any
+      Default Dart (Flutter) linter rules and code style corrections.
+      Many changes to internal processing of classes properties (through access modifiers).
+      Tests corrections to run unit tests and example.
+
 2.0.6 Update pubspec.yaml 
       - environment: sdk: '>=0.8.10+6 <2.0.0'
       - dependencies:

analysis_options.yaml

@@ -0,0 +1,31 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at
+  # https://dart-lang.github.io/linter/lints/index.html.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # non_constant_identifier_names: false
+    # constant_identifier_names: false
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

example/Framework_Verify.dart

@@ -1,79 +1,75 @@
 import 'dart:html';
+
 import 'package:puremvc/puremvc.dart' as mvc;
 
 class Framework_Verify {
+  Framework_Verify() {}
 
-  Framework_Verify() {
-  }
-
-  void verify()
-  {
+  void verify() {
     String multitonKey = "Test Core";
     String dataPoint1 = "Hello";
     String dataPoint2 = "World";
     String proxyName = "DataProxy";
-    List<String> retrievedObject;
+    List<String>? retrievedObject;
     String badJuju = "";
 
     try {
-      write ("<UL>");
+      write("<UL>");
 
       // Get a Facade
-      mvc.IFacade facade = mvc.Facade.getInstance( multitonKey );
-      write ("<LI>Facade created for ${multitonKey}.");
+      mvc.IFacade facade = mvc.Facade.getInstance(multitonKey)!;
+      write("<LI>Facade created for ${multitonKey}.");
 
       // Create some data
-      List<String> dataObject = new List<String>();
-      write ("<LI>Data Object (List&ltString&gt) created.</LI>");
+      List<String> dataObject = List<String>.empty(growable: true);
+      write("<LI>Data Object (List&ltString&gt) created.</LI>");
       dataObject.add(dataPoint1);
-      write ("<LI>Data point added '${dataPoint1}'.</LI>");
+      write("<LI>Data point added '${dataPoint1}'.</LI>");
       dataObject.add(dataPoint2);
-      write ("<LI>Data point added '${dataPoint2}'.</LI>");
+      write("<LI>Data point added '${dataPoint2}'.</LI>");
 
       // Register a Proxy to hold the data
-      mvc.IProxy proxy = new mvc.Proxy( proxyName, dataObject );
-      write( "<LI>Proxy '${proxyName}' created with for Data Object.</LI>");
-      facade.registerProxy( proxy );
-      write ("<LI>Proxy '${proxyName}' registered with Model, via Facade.</LI>");
+      mvc.IProxy proxy = mvc.Proxy(proxyName, dataObject);
+      write("<LI>Proxy '${proxyName}' created with for Data Object.</LI>");
+      facade.registerProxy(proxy);
+      write("<LI>Proxy '${proxyName}' registered with Model, via Facade.</LI>");
 
       // Now retrieve the Proxy
-      mvc.IProxy retrievedProxy = facade.retrieveProxy( proxyName );
-      write ("<LI>Proxy '${proxyName}' retrieved from Model, via Facade.</LI>");
+      mvc.IProxy retrievedProxy = facade.retrieveProxy(proxyName);
+      write("<LI>Proxy '${proxyName}' retrieved from Model, via Facade.</LI>");
 
       // And get the data
       retrievedObject = retrievedProxy.getData();
-      write ("<LI>Data Object (List&ltString&gt) retrieved from ${proxyName}</LI>");
-      write("<LI>Data Object (List&ltString&gt) Length: ${retrievedObject.length}</LI>" );
+      write("<LI>Data Object (List&ltString&gt) retrieved from ${proxyName}</LI>");
+      write("<LI>Data Object (List&ltString&gt) Length: ${retrievedObject!.length}</LI>");
       write("<LI>Contents: ${retrievedObject[0]} ${retrievedObject[1]}</LI>");
 
-      write ("</UL>");
+      write("</UL>");
       // Prove errors will be reported
       // throw "Fungers! I've got jelly in my ears!";
-
-    } on Error catch ( e ) {
+    } on Error catch (e) {
       // Catch any error
       badJuju = e.toString();
-
     } finally {
       // Report final status
-      if ( badJuju.length == 0 && retrievedObject != null
-           && retrievedObject[0] == dataPoint1
-           && retrievedObject[1] == dataPoint2 ){
-        write( "<P/><B>Science!</B> PureMVC is purring like a kitten. Take her out for a spin!");
+      if (badJuju.length == 0 &&
+          retrievedObject != null &&
+          retrievedObject[0] == dataPoint1 &&
+          retrievedObject[1] == dataPoint2) {
+        write("<P/><B>Science!</B> PureMVC is purring like a kitten. Take her out for a spin!");
       } else {
-        write( "<P/><B>Claptrap!</B> Someone's thrown a spanner in the works.");
-        if( badJuju.length>0 ) write( "<B>Bad juju reported:</B> ${badJuju}");
+        write("<P/><B>Claptrap!</B> Someone's thrown a spanner in the works.");
+        if (badJuju.length > 0) write("<B>Bad juju reported:</B> ${badJuju}");
       }
     }
-
   }
 
   void write(String message) {
     // the HTML library defines a global "document" variable
-    document.querySelector('#text').innerHtml = "${document.querySelector('#text').innerHtml}${message}";
+    document.querySelector('#text')?.innerHtml = "${document.querySelector('#text')?.innerHtml}${message}";
   }
 }
 
 void main() {
-  new Framework_Verify().verify();
+  Framework_Verify().verify();
 }

example/Framework_Verify.html

@@ -14,7 +14,6 @@ <h2>Framework Verification Page</h2>
       <p id="text"></p>
     </div>
 
-    <script src="packages/browser/dart.js"></script>
-    <script type="application/dart" src="Framework_Verify.dart"/>
+    <script src="./Framework_Verify.dart.js"></script>
   </body>
 </html>

lib/src/core/Controller.dart

@@ -14,9 +14,7 @@ part of puremvc;
  *
  * See [INotification], [ICommand]
  */
-class Controller implements IController
-{
-
+class Controller implements IController {
   /**
    * Constructor.
    *
@@ -25,12 +23,11 @@ class Controller implements IController
    *
    * -  Throws [MultitonErrorControllerExists] if instance for this Multiton key has already been constructed
    */
-  Controller( String key )
-  {
-    if ( instanceMap[ key ] != null ) throw new MultitonErrorControllerExists();
+  Controller(String key) {
+    if (instanceMap.containsKey(key)) throw MultitonErrorControllerExists();
     multitonKey = key;
-    instanceMap[ multitonKey ] = this;
-    commandMap = new Map<String,Function>();
+    instanceMap[multitonKey] = this;
+    commandMap = Map<String, Function>();
     initializeController();
   }
 
@@ -43,22 +40,22 @@ class Controller implements IController
    * you should also subclass [Controller] and override the [initializeController] method,
    * setting [view] equal to the return value of a call to [getInstance] on your [IView] implementor.
    */
-  void initializeController( )
-  {
-    view = View.getInstance( multitonKey );
+  void initializeController() {
+    view = View.getInstance(multitonKey)!;
   }
 
   /**
    * [IController] Multiton Factory method.
    *
    * -  Returns the [IController] Multiton instance for the specified key
    */
-  static IController getInstance( String key )
-  {
-    if ( key == null || key == "" ) return null;
-    if ( instanceMap == null ) instanceMap = new Map<String,IController>();
-    if ( instanceMap[ key ] == null ) instanceMap[ key ] = new Controller( key );
-    return instanceMap[ key ];
+  static IController? getInstance(String? key) {
+    if (key == null || key == "") return null;
+    if (instanceMap.containsKey(key)) {
+      return instanceMap[key];
+    } else {
+      return instanceMap[key] = Controller(key);
+    }
   }
 
   /**
@@ -67,14 +64,14 @@ class Controller implements IController
    *
    * -  Param [note] - the [INotification] to execute the associated [ICommand] for
    */
-  void executeCommand( INotification note )
-  {
-    Function commandFactory = commandMap[ note.getName() ];
-    if ( commandFactory == null ) return;
+  void executeCommand(INotification note) {
+    final noteName = note.getName();
+    Function? commandFactory = commandMap[noteName];
+    if (commandFactory == null) return;
 
     ICommand commandInstance = commandFactory();
-    commandInstance.initializeNotifier( multitonKey );
-    commandInstance.execute( note );
+    commandInstance.initializeNotifier(multitonKey);
+    commandInstance.execute(note);
   }
 
   /**
@@ -83,12 +80,11 @@ class Controller implements IController
    * -  Param [noteName] - the name of the [INotification] to associate the [ICommand] with.
    * -  Param [commandFactory] - a function that creates a new instance of the [ICommand].
    */
-  void registerCommand( String noteName, Function commandFactory )
-  {
-    if ( commandMap[ noteName ] == null ) {
-      view.registerObserver( noteName, new Observer( executeCommand, this ) );
+  void registerCommand(String noteName, Function commandFactory) {
+    if (!hasCommand(noteName)) {
+      view.registerObserver(noteName, Observer(executeCommand, this));
     }
-    commandMap[ noteName ] = commandFactory;
+    commandMap[noteName] = commandFactory;
   }
 
   /**
@@ -97,26 +93,23 @@ class Controller implements IController
    * -  Param [noteName] - the name of the [INotification].
    * -  Returns [bool] - whether an [ICommand] is currently registered for the given [noteName].
    */
-  bool hasCommand( String noteName )
-  {
-    return commandMap[ noteName ] != null;
+  bool hasCommand(String noteName) {
+    return commandMap.containsKey(noteName);
   }
 
   /**
    * Remove a previously registered [INotification] to [ICommand] mapping from the [IController].
    *
    * -  Param [noteName] - the name of the [INotification] to remove the [ICommand] mapping for.
    */
-  void removeCommand( String noteName )
-  {
+  void removeCommand(String noteName) {
     // if the Command is registered...
-    if ( hasCommand( noteName ) )
-    {
+    if (hasCommand(noteName)) {
       // remove the observer
-      view.removeObserver( noteName, this );
+      view.removeObserver(noteName, this);
 
       // remove the command
-      commandMap[ noteName ] = null;
+      commandMap.remove(noteName);
     }
   }
 
@@ -125,23 +118,23 @@ class Controller implements IController
    *
    * -  Param [key] multitonKey of the [IController] instance to remove
    */
-  static void removeController( String key )
-  {
-    instanceMap[ key ] = null;
+  static void removeController(String key) {
+    instanceMap.remove(key);
   }
 
   // Local reference to this core's IView
-  IView view;
+  late IView view;
 
   // Mapping of Notification names to Command Class references
-  Map<String,Function> commandMap;
+  late Map<String, Function?> commandMap;
 
   // The Multiton Key for this Core
-  String multitonKey;
+  late String _multitonKey;
+  String get multitonKey => _multitonKey;
+  void set multitonKey(value) => _multitonKey = value;
 
   // Multiton instance map
-  static Map<String,IController> instanceMap;
-
+  static Map<String, IController> instanceMap = Map<String, IController>();
 }
 
 class MultitonErrorControllerExists {